diff --git a/.travis.yml b/.travis.yml index e376e688..09e2e59b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ env: # Environment variables for packaging - PRODUCT=flameshot #TODO: we should take version from the last tag in git history + build number - - VERSION=0.7.4 + - VERSION=0.7.3 - RELEASE=1 - ARCH=x86_64 # Dockerfile from https://github.com/flameshotapp/flameshot-docker-images diff --git a/appveyor.yml b/appveyor.yml index 0a863225..b9d5272d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ image: Visual Studio 2015 #TODO: we should take version from the last tag in git history + build number -version: 0.7.4.{build} +version: 0.7.3.{build} # Major_Version_Number.Minor_Version_Number.Patch_Number.Build_Number skip_branch_with_pr: true diff --git a/docs/dev/release.md b/docs/dev/release.md index 92652685..457c9882 100644 --- a/docs/dev/release.md +++ b/docs/dev/release.md @@ -1,4 +1,78 @@ - What to do before every release? +# Build Windows Installation: + +## Prepare new release + +### Step 1 + +Update translations + +``` +lupdate -recursive ./ -ts ./translations/* +``` + +### Step 2 + +Example update from `0.7.2` to `0.7.3`. + +Update lines in the file `update_version_everywhere.sh` + +``` +BASE_VERSION_NEW=0.7.2 +``` + +with: + +``` +BASE_VERSION_NEW=0.7.3 +``` + +### Step 3 + +Run script `update_version_everywhere.sh`. + + +### Step 4 + +Upload binaries from `appveyour` to github + +### What does script `update_version_everywhere.sh` do: + +* It will update version information in all project files (*.pro, *.cpp, ci/cd files etc). +* Create new commit with the text "Update version to 0.7.3" (according to current example) +* Push current branch into the repository. +* Add tag version `v0.7.3` + + +## Cancel release + +You need to remove version tag, example: + +``` +git tag -d v0.7.3 +git push origin :refs/tags/v0.7.3 +``` + +## How to build a specific version + +Example for version `0.7.3`. + +Get required code and trigger a build: +``` +git clone git@github.com:namecheap/flameshot.git +cd flameshot/ +git checkout tags/v0.7.3 -b build/v0.7.3 +git push origin -u build/v0.7.3 +``` + +Appveyor CI will be triggered automatically on any push. + +Open the link https://ci.appveyor.com/project/namecheap/flameshot in a browser and wait for a new build. + +_Note: you can get currently install version from Windows Software center (Flameshot is included into approved NameCheaps Software list) or just as for someone from `Local IT` department._ + + +# Old release documentation +What to do before every release? - Update translations. - Update travis version diff --git a/flameshot.pro b/flameshot.pro index 94a731e8..1b94a1dd 100644 --- a/flameshot.pro +++ b/flameshot.pro @@ -6,10 +6,9 @@ win32:LIBS += -luser32 -lshell32 -BASE_VERSION = 0.7.4 -TAG_VERSION = "$$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags)" +BASE_VERSION = 0.7.3 +TAG_VERSION = "$$system(git --git-dir $$PWD/.git rev-parse --short HEAD)" isEmpty(TAG_VERSION){ - TAG_VERSION = $$BASE_VERSION DEFINES += APP_VERSION=\\\"$$BASE_VERSION\\\" } else { @@ -33,7 +32,7 @@ win32:RC_ICONS += img/app/flameshot.ico QMAKE_TARGET_COMPANY = "NameCheap" QMAKE_TARGET_COPYRIGHT = "GNU General Public License v3.0" QMAKE_TARGET_DESCRIPTION = "Flameshot - S3 bucket edition" -VERSION = $$BASE_VERSION + "." + $$TAG_VERSION +VERSION = $$BASE_VERSION #release: DESTDIR = build/release #debug: DESTDIR = build/debug diff --git a/translations/Internationalization_ca.ts b/translations/Internationalization_ca.ts index f7646be6..535d87c7 100644 --- a/translations/Internationalization_ca.ts +++ b/translations/Internationalization_ca.ts @@ -51,12 +51,12 @@ ArrowTool - + Arrow Fletxa - + Set the Arrow as the paint tool Estableix la fletxa com a eina de dibuix @@ -74,16 +74,64 @@ Estableix el desenfocament com a eina de dibuix + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Impossible capturar la pantalla Imposible capturar la pantalla - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -131,22 +179,27 @@ Press Space to open the side panel. Controller - + + &Open Launcher + + + + &Configuration &Configuració - + &Information &Informació - + &Quit &Ix - + &Take Screenshot @@ -236,95 +289,171 @@ Press Space to open the side panel. GeneneralConf - + Show help message Mostra el missatge d'ajuda - + Show the help message at the beginning in the capture mode. Mostra el missatge d'ajuda en iniciar el mode de captura. - - + + Show desktop notifications Mostra les notificacions d'escriptori - + Show tray icon Mostra la icona en la barra de tasques - + Show the systemtray icon Mostra la icona en la barra de tasques - - + + Import Importar - - + + Error Error - + Unable to read file. Impossible llegir el fitxer. - - + + Unable to write file. Impossible escriure al fitxer. - + Save File Guardar Arxiu - + Confirm Reset Confirmar Reset - + Are you sure you want to reset the configuration? Esteu segur que voleu reiniciar la configuració? - + Configuration File Fitxer de Configuració - + Export Exportar - + Reset Reset - + Launch at startup Llançament a l'inici - + Launch Flameshot + + + Close application after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + + + + ImgS3Uploader + + + Upload to ImgS3 + + + + + Uploading Image + S'està pujant la imatge + + + + Copy URL + Copia l'URL + + + + Open URL + Obri l'URL + + + + Image to Clipboard. + Imatge al porta-retalls. + + + + Unable to open the URL. + No es pot obrir l'URL. + + + + URL copied to clipboard. + L'URL s'ha copiat al porta-retalls. + + + + Screenshot copied to clipboard. + La captura s'ha copiat al porta-retalls. + + + + ImgS3UploaderTool + + + Image Uploader + Puja la imatge + + + + Upload the selection to S3 bucket + + ImgurUploader @@ -334,43 +463,43 @@ Press Space to open the side panel. Puja a Imgur - + Uploading Image S'està pujant la imatge - + Copy URL Copia l'URL - + Open URL Obri l'URL - + Image to Clipboard. Imatge al porta-retalls. - - + + Unable to open the URL. No es pot obrir l'URL. - + URL copied to clipboard. L'URL s'ha copiat al porta-retalls. - + Screenshot copied to clipboard. La captura s'ha copiat al porta-retalls. - + Delete image @@ -395,6 +524,11 @@ Press Space to open the side panel. About Quant a + + + SPACEBAR + + Right Click @@ -484,12 +618,12 @@ Press Space to open the side panel. LineTool - + Line Línia - + Set the Line as the paint tool Estableix la línia com a eina de dibuix @@ -497,12 +631,12 @@ Press Space to open the side panel. MarkerTool - + Marker Marcador - + Set the Marker as the paint tool Estableix el marcador com a eina de dibuix @@ -549,27 +683,28 @@ Press Space to open the side panel. QObject - + Save Error S'ha produït un error en guardar - - + + Capture saved as Anomena i guarda la captura - - + + Error trying to save as S'ha produït un error en anomenar i guardar - - - - + + + + + Unable to connect via DBus No es pot connectar mitjançant DBus @@ -588,6 +723,12 @@ Press Space to open the side panel. Capture saved to clipboard + + + + URL copied to clipboard. + L'URL s'ha copiat al porta-retalls. + RectangleTool @@ -796,7 +937,7 @@ Press Space to open the side panel. SystemNotification - + Flameshot Info diff --git a/translations/Internationalization_de_DE.ts b/translations/Internationalization_de_DE.ts index 0a6ef859..ca7833d1 100644 --- a/translations/Internationalization_de_DE.ts +++ b/translations/Internationalization_de_DE.ts @@ -51,12 +51,12 @@ ArrowTool - + Arrow Pfeil - + Set the Arrow as the paint tool Wähle den Pfeil als Werkzeug @@ -74,15 +74,63 @@ Wähle Verwischen als Werkzeug + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Bereich kann nicht erfasst werden - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -134,22 +182,27 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. Controller - + &Take Screenshot &Bildschirmaufnahme anfertigen - + + &Open Launcher + + + + &Configuration &Einstellungen - + &Information &Informationen - + &Quit &Beenden @@ -239,95 +292,171 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. GeneneralConf - - + + Import Importieren - - + + Error Fehler - + Unable to read file. Datei kann nicht gelesen werden. - - + + Unable to write file. Datei kann nicht geschrieben werden. - + Save File Datei speichern - + Confirm Reset Zurücksetzen bestätigen - + Are you sure you want to reset the configuration? Sind Sie sicher, dass sie die Konfiguration zurücksetzen wollen? - + Show help message Hilfetext anzeigen - + Show the help message at the beginning in the capture mode. Hilfetext am Start der Auswahl anzeigen. - - + + Show desktop notifications Zeige Desktopbenachrichtigungen - + Show tray icon Zeige Taskleistensymbol - + Show the systemtray icon Zeigt das Taskleistensymbol - + Configuration File Konfigurationsdatei - + Export Exportieren - + Reset Zurücksetzen - + Launch at startup Automatisch starten - + Launch Flameshot Starte Flameshot + + + Close application after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + + + + ImgS3Uploader + + + Upload to ImgS3 + + + + + Uploading Image + Bild hochladen + + + + Copy URL + URL kopieren + + + + Open URL + URL öffnen + + + + Image to Clipboard. + Bild in Zwischenablage. + + + + Unable to open the URL. + Kann URL nicht öffnen. + + + + URL copied to clipboard. + URL kopiert. + + + + Screenshot copied to clipboard. + Bildschirmaufnahme in Zwischenablage kopiert. + + + + ImgS3UploaderTool + + + Image Uploader + Bild hochladen + + + + Upload the selection to S3 bucket + + ImgurUploader @@ -337,43 +466,43 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. Zu Imgur hochladen - + Uploading Image Bild hochladen - + Copy URL URL kopieren - + Open URL URL öffnen - + Delete image Bild löschen - + Image to Clipboard. Bild in Zwischenablage. - - + + Unable to open the URL. Kann URL nicht öffnen. - + URL copied to clipboard. URL kopiert. - + Screenshot copied to clipboard. Bildschirmaufnahme in Zwischenablage kopiert. @@ -402,7 +531,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. SPACEBAR Leertaste - + Right Click @@ -492,12 +621,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. LineTool - + Line Linie - + Set the Line as the paint tool Wähle Linie als Werkzeug @@ -505,12 +634,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. MarkerTool - + Marker Markierer - + Set the Marker as the paint tool Wähle den Markierer als Werkzeug @@ -546,7 +675,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. Pin Tool - Pinnwand Werkzeug + Pinnwand Werkzeug @@ -557,13 +686,13 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. QObject - + Save Error Speicherfehler - - + + Capture saved as Aufnahme gespeichert als @@ -573,16 +702,17 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. Aufnahme in Zwischenablage gespeichert - - + + Error trying to save as Fehler beim Speichern unter - - - - + + + + + Unable to connect via DBus Kann nicht via DBus verbinden @@ -596,6 +726,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. Unable to write in Kein Schreibzugriff auf + + + + URL copied to clipboard. + URL kopiert. + RectangleTool @@ -804,7 +940,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. SystemNotification - + Flameshot Info Flameshot Info diff --git a/translations/Internationalization_es.ts b/translations/Internationalization_es.ts index 9773bb5e..0a5eca1b 100644 --- a/translations/Internationalization_es.ts +++ b/translations/Internationalization_es.ts @@ -51,12 +51,12 @@ ArrowTool - + Arrow Flecha - + Set the Arrow as the paint tool Establece la Flecha como herramienta de dibujo @@ -74,15 +74,63 @@ Establece el Desenfoque como herramienta de dibujo + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Imposible capturar la pantalla - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -134,22 +182,27 @@ Presiona Espacio para abrir el panel lateral. Controller - + &Take Screenshot &Tomar captura de pantalla - + + &Open Launcher + + + + &Configuration &Configuración - + &Information &Información - + &Quit &Salir @@ -239,95 +292,171 @@ Presiona Espacio para abrir el panel lateral. GeneneralConf - - + + Import Importar - - + + Error Error - + Unable to read file. Imposible leer el archivo. - - + + Unable to write file. Imposible escribir el archivo. - + Save File Guardar Archivo - + Confirm Reset Confirmar Reset - + Are you sure you want to reset the configuration? ¿Estás seguro de que quieres reiniciar la configuración? - + Show help message Mostrar mensaje de ayuda - + Show the help message at the beginning in the capture mode. Muestra el mensaje de ayuda al iniciar el modo de captura. - - + + Show desktop notifications Mostrar notificaciones del escritorio - + Show tray icon Mostrar icono en la barra de tareas - + Show the systemtray icon Mostrar el icono en la barra de tareas - + Configuration File Archivo de Configuración - + Export Exportar - + Reset Reset - + Launch at startup Lanzar en el arranque - + Launch Flameshot Lanzar Flameshot + + + Close application after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + + + + ImgS3Uploader + + + Upload to ImgS3 + + + + + Uploading Image + Subiendo Imagen + + + + Copy URL + Copiar URL + + + + Open URL + Abrir URL + + + + Image to Clipboard. + Imagen al Portapapeles. + + + + Unable to open the URL. + No puede abrir la URL. + + + + URL copied to clipboard. + URL copiada al portapapeles. + + + + Screenshot copied to clipboard. + Captura copiada al portapapeles. + + + + ImgS3UploaderTool + + + Image Uploader + Subir Imagen + + + + Upload the selection to S3 bucket + + ImgurUploader @@ -337,43 +466,43 @@ Presiona Espacio para abrir el panel lateral. Subir a Imgur - + Uploading Image Subiendo Imagen - + Copy URL Copiar URL - + Open URL Abrir URL - + Delete image Borrar imagen - + Image to Clipboard. Imagen al Portapapeles. - - + + Unable to open the URL. No puede abrir la URL. - + URL copied to clipboard. URL copiada al portapapeles. - + Screenshot copied to clipboard. Captura copiada al portapapeles. @@ -398,6 +527,11 @@ Presiona Espacio para abrir el panel lateral. About Información + + + SPACEBAR + + Right Click @@ -487,12 +621,12 @@ Presiona Espacio para abrir el panel lateral. LineTool - + Line Línea - + Set the Line as the paint tool Establece la Línea como herramienta de dibujo @@ -500,12 +634,12 @@ Presiona Espacio para abrir el panel lateral. MarkerTool - + Marker Marcador - + Set the Marker as the paint tool Establece el Marcador como herramienta de dibujo @@ -552,13 +686,13 @@ Presiona Espacio para abrir el panel lateral. QObject - + Save Error Error al Guardar - - + + Capture saved as Captura guardada como @@ -568,16 +702,17 @@ Presiona Espacio para abrir el panel lateral. Captura guardada en el portapapeles - - + + Error trying to save as Error intentando guardar como - - - - + + + + + Unable to connect via DBus Imposible conectar mediante DBus @@ -591,6 +726,12 @@ Presiona Espacio para abrir el panel lateral. Unable to write in Imposible escribir en + + + + URL copied to clipboard. + URL copiada al portapapeles. + RectangleTool @@ -799,7 +940,7 @@ Presiona Espacio para abrir el panel lateral. SystemNotification - + Flameshot Info Información de Flameshot diff --git a/translations/Internationalization_fr.ts b/translations/Internationalization_fr.ts index 7e2517fc..ccc92f2f 100644 --- a/translations/Internationalization_fr.ts +++ b/translations/Internationalization_fr.ts @@ -51,12 +51,12 @@ ArrowTool - + Arrow Flèche - + Set the Arrow as the paint tool Sélectionner l'outil Flèche @@ -74,24 +74,72 @@ Sélectionner l'outil Flou + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Imposible de capturer l'écran - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. Use the Mouse Wheel to change the thickness of your tool. Press Space to open the side panel. Sélectionner une zone avec la souris ou appuyer sur Echap pour quitter -Appuyer sur Entrée pour capturer l'écran +Appuyer sur Entrée pour capturer l'écran Effectuer un clic droit pour afficher le sélecteur de couleurs. -Utiliser la molette de la souris pour changer l'épaisseur de l'outil. +Utiliser la molette de la souris pour changer l'épaisseur de l'outil. Appuyer sur Espace pour ouvrir le panneau latéral. @@ -108,24 +156,6 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Sélectionner l'outil Ellipse - - SidePanelWidget - - - Active color: - Couleur actuelle: - - - - Press ESC to cancel - Appuyer sur Echap pour annuler - - - - Grab Color - Saisir la couleur - - ConfigWindow @@ -152,22 +182,27 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Controller - + &Take Screenshot &Capturer l'écran - + + &Open Launcher + + + + &Configuration &Configuration - + &Information &Informations - + &Quit &Quitter @@ -257,105 +292,171 @@ Appuyer sur Espace pour ouvrir le panneau latéral. GeneneralConf - - + + Import Importer - - + + Error Erreur - + Unable to read file. Impossible de lire le fichier. - - + + Unable to write file. Impossible d'écrire le fichier. - + Save File Sauvegarder le fichier - + Confirm Reset Confirmer la Réinitialisation - + Are you sure you want to reset the configuration? Êtes-vous sûr de vouloir réinitialiser la configuration ? - + Show help message Montrer le message d'aide - + Show the help message at the beginning in the capture mode. Afficher ce message au lancement du mode capture. - - + + Show desktop notifications Afficher les notifications du bureau - + Show tray icon Afficher les icones de la barre d'état - + Show the systemtray icon Afficher l'icône dans la barre de tâches - + Configuration File Fichier de Configuration - + Export Exporter - + Reset Réinitialiser - + Launch at startup Lancer au démarrage - + Launch Flameshot Démarrer Flameshot - + Close application after capture Fermer après une capture - + Close after taking a screenshot Fermer l'application après une capture d'écran + + + Copy URL after upload + + + + + Copy URL and close window after upload + + + + + ImgS3Uploader + + + Upload to ImgS3 + + + + + Uploading Image + Mise en ligne de l'image + + + + Copy URL + Copier l'URL + + + + Open URL + Ouvrir l'URL + + + + Image to Clipboard. + Image dans le Presse-papier. + + + + Unable to open the URL. + Impossible d'ouvrir l'URL. + + + + URL copied to clipboard. + URL copiée dans le Presse-papier. + + + + Screenshot copied to clipboard. + Capture d'écran copiée dans le Presse-papier. + + + + ImgS3UploaderTool + + + Image Uploader + Mise en ligne d'images + + + + Upload the selection to S3 bucket + + ImgurUploader @@ -365,43 +466,43 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Mettre en ligne vers Imgur - + Uploading Image Mise en ligne de l'image - + Copy URL Copier l'URL - + Open URL Ouvrir l'URL - + Delete image - + Image to Clipboard. Image dans le Presse-papier. - - + + Unable to open the URL. Impossible d'ouvrir l'URL. - + URL copied to clipboard. URL copiée dans le Presse-papier. - + Screenshot copied to clipboard. Capture d'écran copiée dans le Presse-papier. @@ -426,6 +527,11 @@ Appuyer sur Espace pour ouvrir le panneau latéral. About À propos + + + SPACEBAR + + Right Click @@ -515,12 +621,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. LineTool - + Line Ligne - + Set the Line as the paint tool Sélectionner l'outil Ligne @@ -528,12 +634,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. MarkerTool - + Marker Surligneur - + Set the Marker as the paint tool Sélectionner l'outil Surligneur @@ -580,13 +686,13 @@ Appuyer sur Espace pour ouvrir le panneau latéral. QObject - + Save Error Erreur lors de la sauvegarde - - + + Capture saved as Capture d'écran sauvegardée sous @@ -596,16 +702,17 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Capture d'écran copiée dans le Presse-papier - - + + Error trying to save as Erreur lors de la sauvegarde sous - - - - + + + + + Unable to connect via DBus Impossible de se connecter via DBus @@ -619,6 +726,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Unable to write in Imposible d'écrire par dessus + + + + URL copied to clipboard. + URL copiée dans le Presse-papier. + RectangleTool @@ -682,24 +795,24 @@ Appuyer sur Espace pour ouvrir le panneau latéral. SidePanelWidget - - - Active thickness: - - Active color: - + Couleur actuelle: Press ESC to cancel - + Appuyer sur Echap pour annuler Grab Color + Saisir la couleur + + + + Active thickness: @@ -827,7 +940,7 @@ Appuyer sur Espace pour ouvrir le panneau latéral. SystemNotification - + Flameshot Info Info Flameshot diff --git a/translations/Internationalization_hu.ts b/translations/Internationalization_hu.ts index e779ce30..be551b04 100644 --- a/translations/Internationalization_hu.ts +++ b/translations/Internationalization_hu.ts @@ -1,6 +1,6 @@ - + AppLauncher @@ -61,6 +61,45 @@ Beállítja a Homályosítás eszközt festő eszközként + + CaptureLauncher + + <b>Capture Mode</b> + + + + Rectangular Region + + + + Full Screen (All Monitors) + + + + No Delay + + + + second + + + + seconds + + + + Take new screenshot + + + + Area: + + + + Delay: + + + CaptureWidget @@ -68,7 +107,7 @@ Press Enter to capture the screen. Press Right Click to show the color picker. Use the Mouse Wheel to change the thickness of your tool. - Válassz egy területet egérrel, vagy nyomj Esc-et a kilépéshez. + Válassz egy területet egérrel, vagy nyomj Esc-et a kilépéshez. Nyomj entert a felvételhez. Kattints job egérgombal a szín választásához. Használd a görgőt az eszköz vastagságának állítására. @@ -77,6 +116,14 @@ Használd a görgőt az eszköz vastagságának állítására. Unable to capture screen Nem lehet felvételt készíteni + + Select an area with the mouse, or press Esc to exit. +Press Enter to capture the screen. +Press Right Click to show the color picker. +Use the Mouse Wheel to change the thickness of your tool. +Press Space to open the side panel. + + CircleTool @@ -122,6 +169,14 @@ Használd a görgőt az eszköz vastagságának állítására. &Quit &Bezár + + &Take Screenshot + + + + &Open Launcher + + CopyTool @@ -131,7 +186,11 @@ Használd a görgőt az eszköz vastagságának állítására. Copies the selecion into the clipboard - Másolja a kiválasztott területet + Másolja a kiválasztott területet + + + Copy the selection into the clipboard + @@ -195,14 +254,14 @@ Használd a görgőt az eszköz vastagságának állítására. FileNameHandler screenshot - Képernyőmentés + Képernyőmentés FlameshotDBusAdapter Unable to capture screen - Nem lehet képernyőképet készíteni + Nem lehet képernyőképet készíteni @@ -275,6 +334,68 @@ Használd a görgőt az eszköz vastagságának állítására. Launch Flameshot Flameshot indítása + + Close application after capture + + + + Close after taking a screenshot + + + + Copy URL after upload + + + + Copy URL and close window after upload + + + + + ImgS3Uploader + + Upload to ImgS3 + + + + Uploading Image + Kép felötlése + + + Copy URL + URL másolása + + + Open URL + URL megnyitása + + + Image to Clipboard. + Kép a vágolapra. + + + Unable to open the URL. + Nem lehet az URL-t megnyitni. + + + URL copied to clipboard. + URL másolva a vágólapra. + + + Screenshot copied to clipboard. + Képernyőmentés másolva a vágólapra. + + + + ImgS3UploaderTool + + Image Uploader + Kép feltöltő + + + Upload the selection to S3 bucket + + ImgurUploader @@ -310,6 +431,10 @@ Használd a görgőt az eszköz vastagságának állítására. Screenshot copied to clipboard. Képernyőmentés másolva a vágólapra. + + Delete image + + ImgurUploaderTool @@ -392,6 +517,14 @@ Használd a görgőt az eszköz vastagságának állítására. Available shortcuts in the screen capture mode. Elérhető gyorsbillentyűk a képernyőfelvétel módban. + + SPACEBAR + + + + Toggle visibility of sidebar with options of the selected tool + + LineTool @@ -437,6 +570,17 @@ Használd a görgőt az eszköz vastagságának állítására. Beállítja a Ceruza eszközt festő eszközként + + PinTool + + Pin Tool + + + + Pin image on the desktop + + + QObject @@ -468,6 +612,10 @@ Használd a görgőt az eszköz vastagságának állítására. Capture saved to clipboard Felvétel mentve a vágólapra + + URL copied to clipboard. + URL másolva a vágólapra. + RectangleTool @@ -486,6 +634,10 @@ Használd a görgőt az eszköz vastagságának állítására. Redo Újra + + Redo the next modification + + SaveTool @@ -498,6 +650,13 @@ Használd a görgőt az eszköz vastagságának állítására. Menti a felvételt + + ScreenGrabber + + Unable to capture screen + + + SelectionTool @@ -509,6 +668,25 @@ Használd a görgőt az eszköz vastagságának állítására. Beállítja a Téglalapos kijelölő eszközt Festő eszközként + + SidePanelWidget + + Active thickness: + + + + Active color: + + + + Press ESC to cancel + + + + Grab Color + + + SizeIndicatorTool @@ -576,11 +754,11 @@ Használd a görgőt az eszköz vastagságának állítására. Time (%H:%M:%S) - Idő (%H:%M:%S) + Idő (%H:%M:%S) Time (%H:%M) - Idő (%H:%M) + Idő (%H:%M) Hour (00-23) @@ -606,6 +784,51 @@ Használd a görgőt az eszköz vastagságának állítására. Full Date (%Y-%m-%d) Teljes dátum (%Y-%m-%d) + + Time (%H-%M-%S) + + + + Time (%H-%M) + + + + + SystemNotification + + Flameshot Info + + + + + TextConfig + + StrikeOut + + + + Underline + + + + Bold + + + + Italic + + + + + TextTool + + Text + + + + Add text to your capture + + UIcolorEditor diff --git a/translations/Internationalization_ja.ts b/translations/Internationalization_ja.ts index 25331690..34a3c27b 100644 --- a/translations/Internationalization_ja.ts +++ b/translations/Internationalization_ja.ts @@ -51,12 +51,12 @@ ArrowTool - + Arrow 矢印 - + Set the Arrow as the paint tool ペイントツールとして「矢印」をセットする @@ -74,15 +74,63 @@ ペイントツールとして「ぼかし」をセットする + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen 画面をキャプチャーできません - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -134,22 +182,27 @@ Enter を押すと画面をキャプチャー。 Controller - + &Take Screenshot スクリーンショットを撮る(&T) - + + &Open Launcher + + + + &Configuration 設定(&C) - + &Information 情報(&I) - + &Quit 終了(&Q) @@ -239,95 +292,171 @@ Enter を押すと画面をキャプチャー。 GeneneralConf - + Show help message ヘルプメッセージを表示する - + Show the help message at the beginning in the capture mode. キャプチャーモード開始時にヘルプメッセージを表示する。 - - + + Show desktop notifications デスクトップの通知を表示する - + Show tray icon トレイアイコンを表示する - + Show the systemtray icon システムトレイアイコンを表示する - - + + Import インポート - - + + Error エラー - + Unable to read file. ファイルを読み込めません。 - - + + Unable to write file. ファイルに書き込めません。 - + Save File ファイルを保存 - + Confirm Reset リセットの確認 - + Are you sure you want to reset the configuration? 設定をリセットしてもよろしいですか? - + Configuration File 設定ファイル - + Export エクスポート - + Reset リセット - + Launch at startup スタートアップ時に起動する - + Launch Flameshot Flameshot を起動する + + + Close application after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + + + + ImgS3Uploader + + + Upload to ImgS3 + + + + + Uploading Image + 画像をアップロード中 + + + + Copy URL + URL をコピー + + + + Open URL + URL を開く + + + + Image to Clipboard. + 画像をクリップボードへ。 + + + + Unable to open the URL. + URL を開けません。 + + + + URL copied to clipboard. + URL をクリップボードにコピーしました。 + + + + Screenshot copied to clipboard. + スクリーンショットをクリップボードにコピーしました。 + + + + ImgS3UploaderTool + + + Image Uploader + 画像アップローダー + + + + Upload the selection to S3 bucket + + ImgurUploader @@ -337,43 +466,43 @@ Enter を押すと画面をキャプチャー。 Imgur にアップロード - + Uploading Image 画像をアップロード中 - + Copy URL URL をコピー - + Open URL URL を開く - + Delete image 画像を削除 - + Image to Clipboard. 画像をクリップボードへ。 - - + + Unable to open the URL. URL を開けません。 - + URL copied to clipboard. URL をクリップボードにコピーしました。 - + Screenshot copied to clipboard. スクリーンショットをクリップボードにコピーしました。 @@ -398,6 +527,11 @@ Enter を押すと画面をキャプチャー。 About このアプリケーションについて + + + SPACEBAR + + Right Click @@ -487,12 +621,12 @@ Enter を押すと画面をキャプチャー。 LineTool - + Line 直線 - + Set the Line as the paint tool ペイントツールとして「直線」をセットする @@ -500,12 +634,12 @@ Enter を押すと画面をキャプチャー。 MarkerTool - + Marker マーカー - + Set the Marker as the paint tool ペイントツールとして「マーカー」をセットする @@ -552,13 +686,13 @@ Enter を押すと画面をキャプチャー。 QObject - + Save Error 保存エラー - - + + Capture saved as キャプチャーを保存しました: @@ -568,16 +702,17 @@ Enter を押すと画面をキャプチャー。 キャプチャーをクリップボードに保存しました - - + + Error trying to save as 保存時にエラーが発生しました: - - - - + + + + + Unable to connect via DBus DBus に接続できません @@ -591,6 +726,12 @@ Enter を押すと画面をキャプチャー。 Unable to write in 書き込めません: + + + + URL copied to clipboard. + URL をクリップボードにコピーしました。 + RectangleTool @@ -799,7 +940,7 @@ Enter を押すと画面をキャプチャー。 SystemNotification - + Flameshot Info Flameshot の情報 diff --git a/translations/Internationalization_ka.ts b/translations/Internationalization_ka.ts index 386ff940..28433e79 100644 --- a/translations/Internationalization_ka.ts +++ b/translations/Internationalization_ka.ts @@ -51,12 +51,12 @@ ArrowTool - + Arrow ისარი - + Set the Arrow as the paint tool ისრის ხელსაწყოს არჩევა სახატავად @@ -74,15 +74,63 @@ გაბუნდოვნების ხელსაწყოს არჩევა სახატავად + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen ეკრანის გადაღება ვერ მოხერხდა - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -130,22 +178,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot - + + &Open Launcher + + + + &Configuration &პარამეტრები - + &Information &ინფორმაცია - + &Quit &გამოსვლა @@ -235,95 +288,171 @@ Press Space to open the side panel. GeneneralConf - - + + Import იმპორტირება - - + + Error შეცდომა - + Unable to read file. ფაილის წაკითხვა ვერ მოხერხდა. - - + + Unable to write file. ფაილის ჩაწერა ვერ მოხერხდა. - + Save File ფაილის შენახვა - + Confirm Reset განულების დადასტურება - + Are you sure you want to reset the configuration? დარწმუნებული ხართ, რომ გსურთ პარამეტრების განულება? - + Show help message დახმარების შეტყობინების ნახვა - + Show the help message at the beginning in the capture mode. დახმარების შეტყობინების ნახვა გადაღების რეჟიმის დაწყებისას. - - + + Show desktop notifications ცნობების ჩვენება სამუშაო მაგიდაზე - + Show tray icon ხატულის ჩვენება სისტემურ პანელზე - + Show the systemtray icon ხატულის ჩვენება სისტემურ პანელზე - + Configuration File პარამეტრების ფაილი - + Export ექსპორტირება - + Reset განულება - + Launch at startup გაშვება სისტემის ჩატვირთვისას - + Launch Flameshot + + + Close application after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + + + + ImgS3Uploader + + + Upload to ImgS3 + + + + + Uploading Image + სურათის ატვირთვა + + + + Copy URL + URL-ის კოპირება + + + + Open URL + URL-ის გახსნა + + + + Image to Clipboard. + სურათის გაცვლის ბუფერში გაგზავნა + + + + Unable to open the URL. + URL-ის გახსნა ვერ მოხერხდა. + + + + URL copied to clipboard. + URL დაკოპირდა გაცვლის ბუფერში. + + + + Screenshot copied to clipboard. + სურათი დაკოპირდა გაცვლის ბუფერში. + + + + ImgS3UploaderTool + + + Image Uploader + სურათის ამტვირთველი + + + + Upload the selection to S3 bucket + + ImgurUploader @@ -333,43 +462,43 @@ Press Space to open the side panel. Imgur-ზე ატვირთვა - + Uploading Image სურათის ატვირთვა - + Copy URL URL-ის კოპირება - + Open URL URL-ის გახსნა - + Delete image - + Image to Clipboard. სურათის გაცვლის ბუფერში გაგზავნა - - + + Unable to open the URL. URL-ის გახსნა ვერ მოხერხდა. - + URL copied to clipboard. URL დაკოპირდა გაცვლის ბუფერში. - + Screenshot copied to clipboard. სურათი დაკოპირდა გაცვლის ბუფერში. @@ -394,6 +523,11 @@ Press Space to open the side panel. About პროგრამის შესახებ + + + SPACEBAR + + Right Click @@ -483,12 +617,12 @@ Press Space to open the side panel. LineTool - + Line ხაზი - + Set the Line as the paint tool ხაზის ხელსაწყოს არჩევა სახატავად @@ -496,12 +630,12 @@ Press Space to open the side panel. MarkerTool - + Marker მარკერი - + Set the Marker as the paint tool მარკერის ხელსაწყოს არჩევა სახატავად @@ -548,13 +682,13 @@ Press Space to open the side panel. QObject - + Save Error შეცდომა შენახვისას - - + + Capture saved as სურათი შენახულია როგორც: @@ -564,16 +698,17 @@ Press Space to open the side panel. - - + + Error trying to save as შეცდომა მცდელობისას შენახულიყო როგორც: - - - - + + + + + Unable to connect via DBus DBus-ით დაკავშირება ვერ მოხერხდა @@ -587,6 +722,12 @@ Press Space to open the side panel. Unable to write in შემდეგ მისამართზე ჩაწერა ვერ მოხერხდა: + + + + URL copied to clipboard. + URL დაკოპირდა გაცვლის ბუფერში. + RectangleTool @@ -795,7 +936,7 @@ Press Space to open the side panel. SystemNotification - + Flameshot Info diff --git a/translations/Internationalization_nl.ts b/translations/Internationalization_nl.ts index e1d59b3e..cf1249a6 100644 --- a/translations/Internationalization_nl.ts +++ b/translations/Internationalization_nl.ts @@ -51,12 +51,12 @@ ArrowTool - + Arrow Cursor - + Set the Arrow as the paint tool Cursor instellen als verfgereedschap @@ -74,15 +74,63 @@ Vervaging instellen als verfgereedschap + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Kan scherm niet vastleggen - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -134,22 +182,27 @@ Druk op spatie om het zijpaneel te openen. Controller - + &Take Screenshot Schermafdruk &maken - + + &Open Launcher + + + + &Configuration &Configuratie - + &Information &Informatie - + &Quit &Afsluiten @@ -239,95 +292,171 @@ Druk op spatie om het zijpaneel te openen. GeneneralConf - - + + Import Importeren - - + + Error Fout - + Unable to read file. Kan bestand niet uitlezen. - - + + Unable to write file. Kan bestand niet wegschrijven. - + Save File Bestand opslaan - + Confirm Reset Herstellen bevestigen - + Are you sure you want to reset the configuration? Weet je zeker dat je de standwaardwaarden van de configuratie wilt herstellen? - + Show help message Uitleg tonen - + Show the help message at the beginning in the capture mode. Toont een bericht met uitleg bij het openen van de vastlegmodus. - - + + Show desktop notifications Bureaubladmeldingen tonen - + Show tray icon Systeemvakpictogram tonen - + Show the systemtray icon Toont het systeemvakpictogram - + Configuration File Configuratiebestand - + Export Exporteren - + Reset Standaardwaarden - + Launch at startup Automatisch opstarten - + Launch Flameshot Flameshot openen + + + Close application after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + + + + ImgS3Uploader + + + Upload to ImgS3 + + + + + Uploading Image + Bezig met uploaden van afbeelding... + + + + Copy URL + URL kopiëren + + + + Open URL + URL openen + + + + Image to Clipboard. + Afbeelding naar klembord. + + + + Unable to open the URL. + Kan URL niet openen. + + + + URL copied to clipboard. + URL gekopieerd naar klembord. + + + + Screenshot copied to clipboard. + Schermafdruk gekopieerd naar klembord. + + + + ImgS3UploaderTool + + + Image Uploader + Afbeeldingsuploader + + + + Upload the selection to S3 bucket + + ImgurUploader @@ -337,43 +466,43 @@ Druk op spatie om het zijpaneel te openen. Uploaden naar Imgur - + Uploading Image Bezig met uploaden van afbeelding... - + Copy URL URL kopiëren - + Open URL URL openen - + Delete image Afbeelding verwijderen - + Image to Clipboard. Afbeelding naar klembord. - - + + Unable to open the URL. Kan URL niet openen. - + URL copied to clipboard. URL gekopieerd naar klembord. - + Screenshot copied to clipboard. Schermafdruk gekopieerd naar klembord. @@ -398,6 +527,11 @@ Druk op spatie om het zijpaneel te openen. About Over + + + SPACEBAR + + Right Click @@ -487,12 +621,12 @@ Druk op spatie om het zijpaneel te openen. LineTool - + Line Lijn - + Set the Line as the paint tool Lijn instellen als verfgereedschap @@ -500,12 +634,12 @@ Druk op spatie om het zijpaneel te openen. MarkerTool - + Marker Markeerstift - + Set the Marker as the paint tool Markeerstift instellen als verfgereedschap @@ -552,13 +686,13 @@ Druk op spatie om het zijpaneel te openen. QObject - + Save Error Fout tijdens opslaan - - + + Capture saved as Schermafdruk opgeslagen als @@ -568,16 +702,17 @@ Druk op spatie om het zijpaneel te openen. Schermafdruk vastgelegd op klembord - - + + Error trying to save as Fout tijdens opslaan als - - - - + + + + + Unable to connect via DBus Kan niet verbinden via DBus @@ -591,6 +726,12 @@ Druk op spatie om het zijpaneel te openen. Unable to write in Kan niet wegschrijven naar + + + + URL copied to clipboard. + URL gekopieerd naar klembord. + RectangleTool @@ -800,7 +941,7 @@ Druk op spatie om het zijpaneel te openen. SystemNotification - + Flameshot Info Flameshot-informatie diff --git a/translations/Internationalization_pl.ts b/translations/Internationalization_pl.ts index ff1a60c6..c06245d7 100644 --- a/translations/Internationalization_pl.ts +++ b/translations/Internationalization_pl.ts @@ -51,12 +51,12 @@ ArrowTool - + Arrow Strzałka - + Set the Arrow as the paint tool Rysowanie strzałek @@ -74,15 +74,63 @@ Rozmywanie obszarów + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Nie można przechwycić ekranu - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -133,22 +181,27 @@ Spacja, aby pokazać panel boczny. Controller - + &Take Screenshot &Zrzut ekranu - + + &Open Launcher + + + + &Configuration &Konfiguracja - + &Information &Informacje - + &Quit &Wyjdź @@ -238,95 +291,171 @@ Spacja, aby pokazać panel boczny. GeneneralConf - - + + Import Import - - + + Error Błąd - + Unable to read file. Nie można odczytać pliku. - - + + Unable to write file. Nie można zapisać pliku. - + Save File Zapisz plik - + Confirm Reset Potwierdź Reset - + Are you sure you want to reset the configuration? Czy na pewno chcesz zresetować konfigurację? - + Show help message Pokaż podpowiedzi - + Show the help message at the beginning in the capture mode. Pokaż podpowiedzi na początku trybu przechwytywania. - - + + Show desktop notifications Pokaż powiadomienia ekranowe - + Show tray icon Pokaż ikonę w trayu - + Show the systemtray icon Pokaż ikonę w zasobniku systemowym - + Configuration File Plik konfiguracyjny - + Export Export - + Reset Reset - + Launch at startup Uruchom podczas startu - + Launch Flameshot Uruchom Flameshot + + + Close application after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + + + + ImgS3Uploader + + + Upload to ImgS3 + + + + + Uploading Image + Wysyłanie obrazka + + + + Copy URL + Kopiuj URL + + + + Open URL + Otwórz URL + + + + Image to Clipboard. + Obrazek do schowka. + + + + Unable to open the URL. + Nie można otworzyć adresu URL. + + + + URL copied to clipboard. + URL skopiowany do schowka. + + + + Screenshot copied to clipboard. + Zrzut ekranu skopiowany do schowka. + + + + ImgS3UploaderTool + + + Image Uploader + Uploader obrazów + + + + Upload the selection to S3 bucket + + ImgurUploader @@ -336,43 +465,43 @@ Spacja, aby pokazać panel boczny. Wyślij do Imgur - + Uploading Image Wysyłanie obrazka - + Copy URL Kopiuj URL - + Open URL Otwórz URL - + Delete image Usuń obrazek - + Image to Clipboard. Obrazek do schowka. - - + + Unable to open the URL. Nie można otworzyć adresu URL. - + URL copied to clipboard. URL skopiowany do schowka. - + Screenshot copied to clipboard. Zrzut ekranu skopiowany do schowka. @@ -397,6 +526,11 @@ Spacja, aby pokazać panel boczny. About O programie + + + SPACEBAR + + Right Click @@ -486,12 +620,12 @@ Spacja, aby pokazać panel boczny. LineTool - + Line Linia - + Set the Line as the paint tool Ustawia linię jako narzędzie do rysowania @@ -499,12 +633,12 @@ Spacja, aby pokazać panel boczny. MarkerTool - + Marker Marker - + Set the Marker as the paint tool Ustawia Marker jako narzędzie rysowania @@ -551,13 +685,13 @@ Spacja, aby pokazać panel boczny. QObject - + Save Error Błąd zapisu - - + + Capture saved as Zaznaczenie zapisano jako @@ -567,16 +701,17 @@ Spacja, aby pokazać panel boczny. Zrzut skopiowano do schowka - - + + Error trying to save as Błąd przy próbie zapisu jako - - - - + + + + + Unable to connect via DBus Nie udało się połączyć za pomocą DBus @@ -590,6 +725,12 @@ Spacja, aby pokazać panel boczny. Unable to write in Nie można zapisać w + + + + URL copied to clipboard. + URL skopiowany do schowka. + RectangleTool @@ -798,7 +939,7 @@ Spacja, aby pokazać panel boczny. SystemNotification - + Flameshot Info Flameshot Info diff --git a/translations/Internationalization_pt_br.ts b/translations/Internationalization_pt_br.ts index 2605fc14..1c33bb61 100644 --- a/translations/Internationalization_pt_br.ts +++ b/translations/Internationalization_pt_br.ts @@ -51,12 +51,12 @@ ArrowTool - + Arrow Flecha - + Set the Arrow as the paint tool Usa a Flecha como ferramenta de desenho @@ -74,15 +74,63 @@ Usa o Desfoque como ferramenta de desenho + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Não foi possível capturar a tela - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -134,22 +182,27 @@ Pressione espaço abrir o painel lateral. Controller - + &Take Screenshot &Tirar Screenshot - + + &Open Launcher + + + + &Configuration &Configuração - + &Information &Informações - + &Quit &Sair @@ -239,95 +292,171 @@ Pressione espaço abrir o painel lateral. GeneneralConf - - + + Import Importar - - + + Error Erro - + Unable to read file. Não foi possível ler o arquivo. - - + + Unable to write file. Não foi possível escrever no arquivo. - + Save File Salvar Arquivo - + Confirm Reset Confirmar Reset - + Are you sure you want to reset the configuration? Tem certeza que deseja resetar a configuração? - + Show help message Mostrar mensagem de ajuda - + Show the help message at the beginning in the capture mode. Mostrar mensagem de ajuda no início do modo de captura. - - + + Show desktop notifications Mostrar notificações de Desktop - + Show tray icon Mostrar ícone de tray - + Show the systemtray icon Mosrar ícone na barra de aplicações - + Configuration File Arquivo de Configurações - + Export Exportar - + Reset Reset - + Launch at startup Iniciar junto com o sistema - + Launch Flameshot Iniciar Flameshot + + + Close application after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + + + + ImgS3Uploader + + + Upload to ImgS3 + + + + + Uploading Image + Upando Imagem + + + + Copy URL + Copiar URL + + + + Open URL + Abrir URL + + + + Image to Clipboard. + Imagem no Clipboard. + + + + Unable to open the URL. + Não foi possível abrir a URL. + + + + URL copied to clipboard. + URL copiada para o clipboard. + + + + Screenshot copied to clipboard. + Screenshot copiada para o clipboard. + + + + ImgS3UploaderTool + + + Image Uploader + Uploader de imagens + + + + Upload the selection to S3 bucket + + ImgurUploader @@ -337,43 +466,43 @@ Pressione espaço abrir o painel lateral. Upload no Imgur - + Uploading Image Upando Imagem - + Copy URL Copiar URL - + Open URL Abrir URL - + Delete image Deletar imagem - + Image to Clipboard. Imagem no Clipboard. - - + + Unable to open the URL. Não foi possível abrir a URL. - + URL copied to clipboard. URL copiada para o clipboard. - + Screenshot copied to clipboard. Screenshot copiada para o clipboard. @@ -398,6 +527,11 @@ Pressione espaço abrir o painel lateral. About Sobre + + + SPACEBAR + + Right Click @@ -487,12 +621,12 @@ Pressione espaço abrir o painel lateral. LineTool - + Line Linha - + Set the Line as the paint tool Usa a Linha como ferramenta de desenho @@ -500,12 +634,12 @@ Pressione espaço abrir o painel lateral. MarkerTool - + Marker Marcador - + Set the Marker as the paint tool Usa o marcador como ferramenta de desenho @@ -552,13 +686,13 @@ Pressione espaço abrir o painel lateral. QObject - + Save Error Salvar erro - - + + Capture saved as Captura salva como @@ -568,16 +702,17 @@ Pressione espaço abrir o painel lateral. Captura salva no clipboard - - + + Error trying to save as Erro tentando salvar como - - - - + + + + + Unable to connect via DBus Não foi possível conectar via DBus @@ -591,6 +726,12 @@ Pressione espaço abrir o painel lateral. Unable to write in Não foi possível escrever em + + + + URL copied to clipboard. + URL copiada para o clipboard. + RectangleTool @@ -799,7 +940,7 @@ Pressione espaço abrir o painel lateral. SystemNotification - + Flameshot Info Informações do Flameshot diff --git a/translations/Internationalization_ru.ts b/translations/Internationalization_ru.ts index ff32a258..661450d6 100644 --- a/translations/Internationalization_ru.ts +++ b/translations/Internationalization_ru.ts @@ -125,12 +125,12 @@ CaptureWidget - + Unable to capture screen Не удалось захватить экран - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -425,28 +425,26 @@ Press Space to open the side panel. Открыть URL - Delete image - Удалить изображение + Удалить изображение - + Image to Clipboard. Изображение в буфер обмена. - - + Unable to open the URL. Не удалось открыть URL. - + URL copied to clipboard. URL скопирован в буфер обмена. - + Screenshot copied to clipboard. Снимок скопирован в буфер обмена. @@ -454,12 +452,12 @@ Press Space to open the side panel. ImgS3UploaderTool - + Image Uploader Отправка изображений - + Upload the selection to S3 bucket Загрузить выделение на S3 diff --git a/translations/Internationalization_sk.ts b/translations/Internationalization_sk.ts index b61a50d4..02599ac1 100644 --- a/translations/Internationalization_sk.ts +++ b/translations/Internationalization_sk.ts @@ -125,12 +125,12 @@ CaptureWidget - + Unable to capture screen Nepodarilo sa zachytiť obrazovku - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -292,105 +292,171 @@ Stlačte medzerník pre otvorenie postranného panelu. GeneneralConf - - + + Import Importovať - - - + + + Error Chyba - + Unable to read file. Zlyhalo čítanie súboru. - - + + Unable to write file. Zlyhal zápis do súboru. - + Save File Uložiť súbor - + Confirm Reset Potvrdiť Reset - + Are you sure you want to reset the configuration? Naozaj si želáte resetovať aktuálnu konfiguráciu? - + Show help message Zobraziť nápovedu - + Show the help message at the beginning in the capture mode. Zobraziť nápovedu na začiatku počas režimu zachytávania obrazovky. - - + + Show desktop notifications Zobraziť systémové upozornenia - + Show tray icon Zobraziť stavovú ikonu - + Show the systemtray icon Zobraziť ikonu v stavovej oblasti - + Configuration File Súbor s konfiguráciou - + Export Exportovať - + Reset Resetovať - + Launch at startup Spúšťať pri štarte - + Launch Flameshot Spustiť Flameshot - + Close application after capture Zavrieť po vytvorení snímky - + Close after taking a screenshot Zatvoriť po vytvorení snímky obrazovky + + + Copy URL after upload + + + + + Copy URL and close window after upload + + + + + ImgS3Uploader + + + Upload to ImgS3 + + + + + Uploading Image + Nahrávam obrázok + + + + Copy URL + Kopírovať URL + + + + Open URL + Otvoriť URL + + + + Image to Clipboard. + Obrázok do schránky. + + + + Unable to open the URL. + Nepodarilo sa otvoriť URL. + + + + URL copied to clipboard. + URL skopírovaná do schránky. + + + + Screenshot copied to clipboard. + Snímka obrazovky bola skopírovaná do schránky. + + + + ImgS3UploaderTool + + + Image Uploader + Uploader obrázkov + + + + Upload the selection to S3 bucket + + ImgurUploader @@ -400,43 +466,43 @@ Stlačte medzerník pre otvorenie postranného panelu. Nahrať na Imgur - + Uploading Image Nahrávam obrázok - + Copy URL Kopírovať URL - + Open URL Otvoriť URL - + Delete image Vymazať obrázok - + Image to Clipboard. Obrázok do schránky. - - + + Unable to open the URL. Nepodarilo sa otvoriť URL. - + URL copied to clipboard. URL skopírovaná do schránky. - + Screenshot copied to clipboard. Snímka obrazovky bola skopírovaná do schránky. @@ -660,6 +726,12 @@ Stlačte medzerník pre otvorenie postranného panelu. Save Error Chyba pri ukladaní + + + + URL copied to clipboard. + URL skopírovaná do schránky. + RectangleTool diff --git a/translations/Internationalization_sr.ts b/translations/Internationalization_sr.ts index 00945fd4..a3de7d9a 100644 --- a/translations/Internationalization_sr.ts +++ b/translations/Internationalization_sr.ts @@ -51,12 +51,12 @@ ArrowTool - + Arrow Стрелица - + Set the Arrow as the paint tool Избор цртања стрелице @@ -74,15 +74,63 @@ Избор цртања замућене области + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Нисам успео да снимим екран - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -134,22 +182,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot &Направи снимак екрана - + + &Open Launcher + + + + &Configuration &Подешавања - + &Information Ин&формације - + &Quit &Излаз @@ -239,95 +292,171 @@ Press Space to open the side panel. GeneneralConf - - + + Import Увоз - - + + Error Грешка - + Unable to read file. Нисам успео да прочитам датотеку. - - + + Unable to write file. Нисам успео да сачувам датотеку. - + Save File Сачувај датотеку - + Confirm Reset Потврда поништавања - + Are you sure you want to reset the configuration? Да ли сте сигурни да желите да поништите сва прилагођена подешавања? - + Show help message Приказуј поруку са упутством - + Show the help message at the beginning in the capture mode. Приказуј поруку са кратким упутством на почетку снимања екрана. - - + + Show desktop notifications Користи системска обавештења - + Show tray icon Иконица на системској полици - + Show the systemtray icon Приказуј иконицу на системској полици - + Configuration File Датотека са подешавањима - + Export Извоз - + Reset Поништи - + Launch at startup Покрени на почетку - + Launch Flameshot Покрени Flameshot + + + Close application after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + + + + ImgS3Uploader + + + Upload to ImgS3 + + + + + Uploading Image + Објављујем слику + + + + Copy URL + Запамти интернет адресу + + + + Open URL + Посети интернет адресу + + + + Image to Clipboard. + Сачувај у привремену меморију. + + + + Unable to open the URL. + Нисам успео да посетим интернет адресу. + + + + URL copied to clipboard. + Интернет адреса је сачувана у привременој меморији. + + + + Screenshot copied to clipboard. + Слика је сачувана у привременој меморији. + + + + ImgS3UploaderTool + + + Image Uploader + Објављивање слике + + + + Upload the selection to S3 bucket + + ImgurUploader @@ -337,43 +466,43 @@ Press Space to open the side panel. Објави на Imgur - + Uploading Image Објављујем слику - + Copy URL Запамти интернет адресу - + Open URL Посети интернет адресу - + Delete image Избриши слику - + Image to Clipboard. Сачувај у привремену меморију. - - + + Unable to open the URL. Нисам успео да посетим интернет адресу. - + URL copied to clipboard. Интернет адреса је сачувана у привременој меморији. - + Screenshot copied to clipboard. Слика је сачувана у привременој меморији. @@ -398,6 +527,11 @@ Press Space to open the side panel. About О програму + + + SPACEBAR + + Right Click @@ -487,12 +621,12 @@ Press Space to open the side panel. LineTool - + Line Линија - + Set the Line as the paint tool Избор цртања линије @@ -500,12 +634,12 @@ Press Space to open the side panel. MarkerTool - + Marker Маркер - + Set the Marker as the paint tool Избор цртања маркером @@ -552,13 +686,13 @@ Press Space to open the side panel. QObject - + Save Error Грешка приликом упусивања - - + + Capture saved as Сачувај снимак као @@ -568,16 +702,17 @@ Press Space to open the side panel. Снимак је сачуван у привремену меморију - - + + Error trying to save as Грешка приликом уписивања као - - - - + + + + + Unable to connect via DBus Нисам успео да се повежем кроз DBus @@ -591,6 +726,12 @@ Press Space to open the side panel. Unable to write in Нисам успео са сачувам + + + + URL copied to clipboard. + Интернет адреса је сачувана у привременој меморији. + RectangleTool @@ -800,7 +941,7 @@ Press Space to open the side panel. SystemNotification - + Flameshot Info Информације о Flameshot-у diff --git a/translations/Internationalization_tr.ts b/translations/Internationalization_tr.ts index c3d7a317..a56a6c9a 100644 --- a/translations/Internationalization_tr.ts +++ b/translations/Internationalization_tr.ts @@ -51,12 +51,12 @@ ArrowTool - + Arrow Ok - + Set the Arrow as the paint tool Oku çizim aracı olarak ayarlar @@ -74,15 +74,63 @@ Bulnıklığı boyama aracı olarak ayarlar + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen Ekran resmi alınamadı - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -134,22 +182,27 @@ Yan paneli açmak için Boşluk tuşuna basın. Controller - + &Take Screenshot &Ekran Resmi Al - + + &Open Launcher + + + + &Configuration &Ayarlar - + &Information &Bilgi - + &Quit &Çıkış @@ -239,95 +292,171 @@ Yan paneli açmak için Boşluk tuşuna basın. GeneneralConf - - + + Import Dışa aktar - - + + Error Hata - + Unable to read file. Dosya okunamıyor. - - + + Unable to write file. Dosya yazılamıyor. - + Save File Dosyayı Kaydet - + Confirm Reset Sıfırlamayı Onayla - + Are you sure you want to reset the configuration? Ayarları sıfırlamak istediğinizden emin misiniz? - + Show help message Yardım mesajını göster - + Show the help message at the beginning in the capture mode. Yakalama modunda başında yardım mesajını gösterin. - - + + Show desktop notifications Masaüstü bildirimlerini göster - + Show tray icon Tepsi simgesini göster - + Show the systemtray icon Sistem tepsisi simgesini göster - + Configuration File Yapılandırma Dosyası - + Export Dışa aktar - + Reset Sıfırla - + Launch at startup Başlangıçta başlatın - + Launch Flameshot Flameshot'ı başlat + + + Close application after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + + + + ImgS3Uploader + + + Upload to ImgS3 + + + + + Uploading Image + Resim Yükleniyor + + + + Copy URL + URL Kopyala + + + + Open URL + URL Aç + + + + Image to Clipboard. + Resim Pano'ya. + + + + Unable to open the URL. + URL açılamıyor. + + + + URL copied to clipboard. + URL panoya kopyalandı. + + + + Screenshot copied to clipboard. + Ekran görüntüsü panoya kopyalandı. + + + + ImgS3UploaderTool + + + Image Uploader + Resim Yükleme Aracı + + + + Upload the selection to S3 bucket + + ImgurUploader @@ -337,43 +466,43 @@ Yan paneli açmak için Boşluk tuşuna basın. Imgur'a yükle - + Uploading Image Resim Yükleniyor - + Copy URL URL Kopyala - + Open URL URL Aç - + Delete image Resmi sil - + Image to Clipboard. Resim Pano'ya. - - + + Unable to open the URL. URL açılamıyor. - + URL copied to clipboard. URL panoya kopyalandı. - + Screenshot copied to clipboard. Ekran görüntüsü panoya kopyalandı. @@ -398,6 +527,11 @@ Yan paneli açmak için Boşluk tuşuna basın. About Hakkında + + + SPACEBAR + + Right Click @@ -487,12 +621,12 @@ Yan paneli açmak için Boşluk tuşuna basın. LineTool - + Line Çizgi - + Set the Line as the paint tool Çizgiyi boyama aracı olarak ayarlar @@ -500,12 +634,12 @@ Yan paneli açmak için Boşluk tuşuna basın. MarkerTool - + Marker İşaretleyici - + Set the Marker as the paint tool İşaretleyiciyi boyama aracı olarak ayarlar @@ -552,13 +686,13 @@ Yan paneli açmak için Boşluk tuşuna basın. QObject - + Save Error Kaydetme Hatası - - + + Capture saved as Yakalama farklı kaydedildi @@ -568,16 +702,17 @@ Yan paneli açmak için Boşluk tuşuna basın. Yakalama panoya kaydedildi - - + + Error trying to save as Farklı kaydetmeye çalışılırken hata oluştu - - - - + + + + + Unable to connect via DBus DBus ile bağlanılamadı @@ -591,6 +726,12 @@ Yan paneli açmak için Boşluk tuşuna basın. Unable to write in Yazma mümkün değil + + + + URL copied to clipboard. + URL panoya kopyalandı. + RectangleTool @@ -799,7 +940,7 @@ Yan paneli açmak için Boşluk tuşuna basın. SystemNotification - + Flameshot Info Flameshot Hakkında diff --git a/translations/Internationalization_uk.ts b/translations/Internationalization_uk.ts index 200cebce..406df45c 100644 --- a/translations/Internationalization_uk.ts +++ b/translations/Internationalization_uk.ts @@ -125,12 +125,12 @@ CaptureWidget - + Unable to capture screen Не вдалось захопити екран - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -425,28 +425,26 @@ Press Space to open the side panel. Відкрити URL - Delete image - Видалити зображення + Видалити зображення - + Image to Clipboard. Зображення до буферу обміну. - - + Unable to open the URL. Не вдалось відкрити URL. - + URL copied to clipboard. URL скопійовано до буферу обміну. - + Screenshot copied to clipboard. Знімок скопійовано до буферу обміну. @@ -454,12 +452,12 @@ Press Space to open the side panel. ImgS3UploaderTool - + Image Uploader Вивантаження зображень - + Upload the selection to S3 bucket Вивантажити виділення на S3 diff --git a/translations/Internationalization_zh_CN.ts b/translations/Internationalization_zh_CN.ts index f9e298ce..1ce7fd82 100644 --- a/translations/Internationalization_zh_CN.ts +++ b/translations/Internationalization_zh_CN.ts @@ -125,13 +125,13 @@ CaptureWidget - + Unable to capture screen 无法捕获屏幕 无法捕获屏幕 - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -293,105 +293,171 @@ Press Space to open the side panel. GeneneralConf - + Show help message 显示帮助文档 - + Show the help message at the beginning in the capture mode. 在捕获之前显示帮助信息。 - - + + Show desktop notifications 显示桌面通知 - + Show tray icon 显示托盘图标 - + Show the systemtray icon 显示任务栏图标 - - + + Import 导入 - - - + + + Error 错误 - + Unable to read file. 无法读取文件。 - - + + Unable to write file. 无法写入文件。 - + Save File 保存到文件 - + Confirm Reset 确定重置 - + Are you sure you want to reset the configuration? 你确定你想要重置配置？ - + Configuration File 配置文件 - + Export 导出 - + Reset 重置 - + Launch at startup 开机时启动 - + Launch Flameshot 启动 Flameshot - + Close application after capture 捕获后关闭 - + Close after taking a screenshot 获取屏幕截图后关闭 + + + Copy URL after upload + + + + + Copy URL and close window after upload + + + + + ImgS3Uploader + + + Upload to ImgS3 + + + + + Uploading Image + 正在上传 + + + + Copy URL + 复制链接 + + + + Open URL + 打开链接 + + + + Image to Clipboard. + 保存文件到剪贴板。 + + + + Unable to open the URL. + 无法打开此链接。 + + + + URL copied to clipboard. + 复制链接到剪贴板。 + + + + Screenshot copied to clipboard. + 截图复制到剪贴板。 + + + + ImgS3UploaderTool + + + Image Uploader + 上传图片 + + + + Upload the selection to S3 bucket + + ImgurUploader @@ -401,43 +467,43 @@ Press Space to open the side panel. 上传到Imgur - + Uploading Image 正在上传 - + Copy URL 复制链接 - + Open URL 打开链接 - + Delete image 删除图像 - + Image to Clipboard. 保存文件到剪贴板。 - - + + Unable to open the URL. 无法打开此链接。 - + URL copied to clipboard. 复制链接到剪贴板。 - + Screenshot copied to clipboard. 截图复制到剪贴板。 @@ -661,6 +727,12 @@ Press Space to open the side panel. Unable to write in 无法写入 + + + + URL copied to clipboard. + 复制链接到剪贴板。 + RectangleTool diff --git a/translations/Internationalization_zh_TW.ts b/translations/Internationalization_zh_TW.ts index 2612b0a3..6e073fbf 100644 --- a/translations/Internationalization_zh_TW.ts +++ b/translations/Internationalization_zh_TW.ts @@ -51,12 +51,12 @@ ArrowTool - + Arrow 箭頭 - + Set the Arrow as the paint tool 選擇箭頭作為繪製工具 @@ -74,15 +74,63 @@ 選擇模糊作為繪製工具 + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + + + + + Full Screen (All Monitors) + + + + + No Delay + + + + + second + + + + + seconds + + + + + Take new screenshot + + + + + Area: + + + + + Delay: + + + CaptureWidget - + Unable to capture screen 無法擷取螢幕 - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -130,22 +178,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot - + + &Open Launcher + + + + &Configuration &設定 - + &Information &資訊 - + &Quit &結束 @@ -235,95 +288,171 @@ Press Space to open the side panel. GeneneralConf - + Show help message 顯示説明資訊 - + Show the help message at the beginning in the capture mode. 在擷取之前顯示説明資訊 - - + + Show desktop notifications 顯示桌面通知 - + Show tray icon 顯示託盤圖示 - + Show the systemtray icon 顯示工作列圖示 - - + + Import 匯入 - - + + Error 錯誤 - + Unable to read file. 無法讀取檔案 - - + + Unable to write file. 無法寫入檔案 - + Save File 存檔 - + Confirm Reset 確認重設 - + Are you sure you want to reset the configuration? 你確定你想要重設？ - + Configuration File 設定檔 - + Export 匯出 - + Reset 重設 - + Launch at startup 自動啟動 - + Launch Flameshot + + + Close application after capture + + + + + Close after taking a screenshot + + + + + Copy URL after upload + + + + + Copy URL and close window after upload + + + + + ImgS3Uploader + + + Upload to ImgS3 + + + + + Uploading Image + 正在上傳 + + + + Copy URL + 複製連結 + + + + Open URL + 打開連結 + + + + Image to Clipboard. + 將檔案複製到剪貼簿 + + + + Unable to open the URL. + 無法打開此連結 + + + + URL copied to clipboard. + 連結已複製到剪貼簿 + + + + Screenshot copied to clipboard. + 截圖已複製到剪貼簿 + + + + ImgS3UploaderTool + + + Image Uploader + 上傳圖片 + + + + Upload the selection to S3 bucket + + ImgurUploader @@ -333,43 +462,43 @@ Press Space to open the side panel. 上傳到 Imgur - + Uploading Image 正在上傳 - + Copy URL 複製連結 - + Open URL 打開連結 - + Delete image - + Image to Clipboard. 將檔案複製到剪貼簿 - - + + Unable to open the URL. 無法打開此連結 - + URL copied to clipboard. 連結已複製到剪貼簿 - + Screenshot copied to clipboard. 截圖已複製到剪貼簿 @@ -394,6 +523,11 @@ Press Space to open the side panel. About 關於 + + + SPACEBAR + + Right Click @@ -483,12 +617,12 @@ Press Space to open the side panel. LineTool - + Line 直線 - + Set the Line as the paint tool 將直線線設定為繪畫工具 @@ -496,12 +630,12 @@ Press Space to open the side panel. MarkerTool - + Marker 標記 - + Set the Marker as the paint tool 將標記設定為繪畫工具 @@ -548,13 +682,13 @@ Press Space to open the side panel. QObject - + Save Error 存檔錯誤 - - + + Capture saved as 截圖已另存為 @@ -564,16 +698,17 @@ Press Space to open the side panel. - - + + Error trying to save as 嘗試另存新檔時發生錯誤 - - - - + + + + + Unable to connect via DBus 無法透過 DBus 進行連接 @@ -587,6 +722,12 @@ Press Space to open the side panel. Unable to write in 無法寫入 + + + + URL copied to clipboard. + 連結已複製到剪貼簿 + RectangleTool @@ -795,7 +936,7 @@ Press Space to open the side panel. SystemNotification - + Flameshot Info diff --git a/update_release_version.sh b/update_release_version.sh new file mode 100755 index 00000000..6feba775 --- /dev/null +++ b/update_release_version.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +BASE_VERSION_NEW="0.7.3" +BASE_VERSION_CUR=$(cat flameshot.pro |grep "[0-9]\+\.[0-9]\+\.[0-9]\+" |awk "{print \$3}") + +if [ "${BASE_VERSION_CUR}" == "${BASE_VERSION_NEW}" ]; then + echo "Current and new versions are the same, no action required" + exit 1 +fi + + +TAG_EXISTS=$(git ls-remote --tags origin |grep "refs/tags/v${BASE_VERSION_NEW}") +if [ "" != "${TAG_EXISTS}" ]; then + echo "Tag already exists: ${TAG_EXISTS}" + echo "Please update to another version or remove git tag" + exit 1 +fi + +# update version to a new one +sed -i "s/BASE_VERSION = ${BASE_VERSION_CUR}/BASE_VERSION = ${BASE_VERSION_NEW}/g" flameshot.pro +sed -i "s/version: ${BASE_VERSION_CUR}/version: ${BASE_VERSION_NEW}/g" appveyor.yml +sed -i "s/VERSION=${BASE_VERSION_CUR}/VERSION=${BASE_VERSION_NEW}/g" .travis.yml +sed -i "s/VersionInfoVersion=${BASE_VERSION_CUR}/VersionInfoVersion=${BASE_VERSION_NEW}/g" ./win_setup/flameshot.iss + +BASE_VERSION_NEW_EXT="${BASE_VERSION_NEW}-$(git rev-parse --short=7 HEAD)" +BASE_VERSION_CUR_EXT=$(cat ./win_setup/flameshot.iss |grep "AppVersion=[0-9]\+\.[0-9]\+\.[0-9]\+-*[0-9a-f]*" |cut -d "=" -f2) +echo "BASE_VERSION_CUR_EXT: ${BASE_VERSION_CUR_EXT}" +sed -i "s/AppVersion=${BASE_VERSION_CUR_EXT}/AppVersion=${BASE_VERSION_NEW_EXT}/g" ./win_setup/flameshot.iss + +qmake + +# push current release +git add flameshot.pro ./win_setup/flameshot.iss appveyor.yml .travis.yml +git commit -m "Update version to ${BASE_VERSION_NEW}" +git push + +# add new release tag +git tag "v${BASE_VERSION_NEW}" +git push origin --tags + +echo "New Flameshot version is: ${BASE_VERSION_NEW}" diff --git a/update_version_everywhere.sh b/update_version_everywhere.sh deleted file mode 100755 index cfc4745e..00000000 --- a/update_version_everywhere.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -BASE_VERSION_OLD=0.7.3 -BASE_VERSION_NEW=0.7.4 - -sed -i "s/BASE_VERSION = ${BASE_VERSION_OLD}/BASE_VERSION = ${BASE_VERSION_NEW}/g" flameshot.pro - -sed -i "s/AppVersion=${BASE_VERSION_OLD}/AppVersion=${BASE_VERSION_NEW}/g" ./win_setup/flameshot.iss -sed -i "s/VersionInfoVersion=${BASE_VERSION_OLD}/VersionInfoVersion=${BASE_VERSION_NEW}/g" ./win_setup/flameshot.iss - -sed -i "s/version: ${BASE_VERSION_OLD}/version: ${BASE_VERSION_NEW}/g" appveyor.yml - -sed -i "s/VERSION=${BASE_VERSION_OLD}/VERSION=${BASE_VERSION_NEW}/g" .travis.yml - -qmake diff --git a/win_setup/flameshot.iss b/win_setup/flameshot.iss index 560aeb24..6dd90494 100644 --- a/win_setup/flameshot.iss +++ b/win_setup/flameshot.iss @@ -6,9 +6,9 @@ [Setup] AppName=Flameshot -AppVersion=0.7.4 +AppVersion=0.7.3-3fbd469 AppCopyright=NameCheap inc. -VersionInfoVersion=0.7.4 +VersionInfoVersion=0.7.3 WizardStyle=modern DefaultDirName={autopf}\Flameshot DefaultGroupName=Flameshot