From 50d5afed8ff337603f967d0e5f095daf2aa18d37 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Fri, 6 Nov 2020 17:31:21 +0200 Subject: [PATCH] Read s3 creds for upload from URL in private network (VPN) --- data/translations/Internationalization_ca.ts | 255 +++--- data/translations/Internationalization_cs.ts | 255 +++--- .../Internationalization_de_DE.ts | 255 +++--- data/translations/Internationalization_es.ts | 255 +++--- data/translations/Internationalization_eu.ts | 255 +++--- data/translations/Internationalization_fr.ts | 255 +++--- data/translations/Internationalization_hu.ts | 28 +- .../Internationalization_it_IT.ts | 251 +++--- data/translations/Internationalization_ja.ts | 255 +++--- data/translations/Internationalization_ka.ts | 255 +++--- data/translations/Internationalization_nl.ts | 255 +++--- .../Internationalization_nl_NL.ts | 255 +++--- data/translations/Internationalization_pl.ts | 255 +++--- .../Internationalization_pt_BR.ts | 255 +++--- data/translations/Internationalization_ru.ts | 253 +++--- data/translations/Internationalization_sk.ts | 255 +++--- .../Internationalization_sr_SP.ts | 255 +++--- .../Internationalization_sv_SE.ts | 255 +++--- data/translations/Internationalization_tr.ts | 255 +++--- data/translations/Internationalization_uk.ts | 253 +++--- .../Internationalization_zh_CN.ts | 255 +++--- .../Internationalization_zh_HK.ts | 829 ++++++++++++------ .../Internationalization_zh_TW.ts | 255 +++--- src/config/uploadstorageconfig.cpp | 4 +- src/tools/storage/imguploader.cpp | 4 +- .../s3/amazon-server-side/doc/README.md | 6 +- .../storage/s3/config-examples/config.ini | 11 + .../s3/config-examples/config_proxy.ini | 16 + src/tools/storage/s3/imgs3settings.cpp | 338 ++++++- src/tools/storage/s3/imgs3settings.h | 63 +- src/tools/storage/s3/imgs3uploader.cpp | 219 ++--- src/tools/storage/s3/imgs3uploader.h | 16 +- src/tools/storage/storagemanager.cpp | 22 +- src/tools/storage/storagemanager.h | 4 +- src/utils/confighandler.cpp | 37 +- src/utils/confighandler.h | 7 + 36 files changed, 4039 insertions(+), 2912 deletions(-) create mode 100644 src/tools/storage/s3/config-examples/config.ini create mode 100644 src/tools/storage/s3/config-examples/config_proxy.ini diff --git a/data/translations/Internationalization_ca.ts b/data/translations/Internationalization_ca.ts index ff56d241..fa37337d 100644 --- a/data/translations/Internationalization_ca.ts +++ b/data/translations/Internationalization_ca.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> - + Rectangular Region - + Full Screen (All Monitors) - + No Delay - + second - + seconds - + Take new screenshot - + Area: - + Delay: @@ -205,22 +205,22 @@ Press Space to open the side panel. Controller - + &Open Launcher - + &Configuration &Configuració - + &About - + &Latest Uploads @@ -229,12 +229,12 @@ Press Space to open the side panel. &Informació - + &Quit &Ix - + &Take Screenshot @@ -324,170 +324,170 @@ 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ó? - + Show the side panel button - + Show the side panel toggle button in the capture mode. - + Configuration File Fitxer de Configuració - + Export Exportar - + Reset Reset - + Launch at startup Llançament a l'inici - - + + Launch Flameshot - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - + Change... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -495,27 +495,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Copia l'URL - + URL copied to clipboard. L'URL s'ha copiat al porta-retalls. - + Open in browser @@ -528,9 +528,14 @@ Press Space to open the side panel. - Uploading Image - S'està pujant la imatge + S'està pujant la imatge + + + + + Uploading Image... + @@ -543,40 +548,56 @@ Press Space to open the side panel. - + URL copied to clipboard. L'URL s'ha copiat al porta-retalls. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + Error + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -594,15 +615,8 @@ Press Space to open the side panel. - - Uploading Image - S'està pujant la imatge - - - - Upload image - + S'està pujant la imatge @@ -620,10 +634,16 @@ Press Space to open the side panel. La captura s'ha copiat al porta-retalls. + Deleting image... + + + Uploading Image... + + Copy URL @@ -635,6 +655,7 @@ Press Space to open the side panel. Obri l'URL + Delete image @@ -656,7 +677,7 @@ Press Space to open the side panel. ImgurUploader - + Upload to Imgur Puja a Imgur @@ -677,7 +698,7 @@ Press Space to open the side panel. Imatge al porta-retalls. - + Unable to open the URL. No es pot obrir l'URL. @@ -1045,7 +1066,7 @@ You may need to escape the '#' sign as in '\#FFF' - + URL copied to clipboard. L'URL s'ha copiat al porta-retalls. @@ -1086,77 +1107,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture Ix de la captura - + Screenshot history - + Capture screen - + Show color picker Mostra el selector de color - + Change the tool's thickness Canvia el gruix de l'eina @@ -1242,22 +1263,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. Dreceres disponibles en el mode de captura de pantalla. - + Description Descripció - + Key Tecla @@ -1316,92 +1337,92 @@ You can find me in the system tray. Any (2000) - + Month Name (jan) Nom del mes (jul) - + Month Name (january) Nom del mes (juliol) - + Month (01-12) Mes (01-12) - + Week Day (1-7) Dia de la setmana (1-7) - + Week (01-53) Setmana (01-53) - + Day Name (mon) Nom del dia (dg) - + Day Name (monday) Nom del dia (diumenge) - + Day (01-31) Dia (01-31) - + Day of Month (1-31) Dia del mes (1-31) - + Day (001-366) Dia (001-366) - + Hour (00-23) Hora (00-23) - + Hour (01-12) Hora (01-12) - + Minute (00-59) Minut (00-59) - + Second (00-59) Segon (00-59) - + Full Date (%m/%d/%y) Data (%m/%d/%y) - + Full Date (%Y-%m-%d) Data (%Y-%m-%d) - + Time (%H-%M-%S) - + Time (%H-%M) diff --git a/data/translations/Internationalization_cs.ts b/data/translations/Internationalization_cs.ts index 2a6fb76a..36cd2633 100644 --- a/data/translations/Internationalization_cs.ts +++ b/data/translations/Internationalization_cs.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> <b>Režim zachytávání</b> - + Rectangular Region Pravouhlá oblast - + Full Screen (All Monitors) Celá obrazovka (všechny monitory) - + No Delay Bez zpoždění - + second sekunda - + seconds sekund - + Take new screenshot Zachytit nový snímek - + Area: Oblast: - + Delay: Zpoždění: @@ -208,27 +208,27 @@ Stiskněte mezerník pro otevření postranního panelu. Controller - + &Take Screenshot &Zachytit obrazovku - + &Open Launcher &Otevřít spouštěč - + &Configuration &Nastavení - + &About O &programu - + &Latest Uploads @@ -237,7 +237,7 @@ Stiskněte mezerník pro otevření postranního panelu. &Informace - + &Quit &Ukončit @@ -327,114 +327,114 @@ Stiskněte mezerník pro otevření postranního panelu. GeneneralConf - - + + Import Zavést - - - - + + + + Error Chyba - + Unable to read file. Nelze přečíst soubor. - - + + Unable to write file. Nelze zapsat soubor. - + Save File Uložit soubor - + Confirm Reset Potvrdit vrácení na výchozí - + Are you sure you want to reset the configuration? Opravdu chcete nastavení vrátit do výchozího stavu? - + Show help message Ukázat zprávu s nápovědou - + Show the help message at the beginning in the capture mode. Ukázat zprávu s nápovědou na začátku v režimu zachytávání. - + Show the side panel button Ukázat tlačítko na postranním panelu - + Show the side panel toggle button in the capture mode. V režimu zachytávání ukazovat tlačítko na postranním panelu. - - + + Show desktop notifications Ukázat oznámení - + Show tray icon Ukázat ikonu v oznamovací oblasti panelu - + Show the systemtray icon Ukázat ikonu v oznamovací oblasti panelu - + Configuration File Soubor s nastavením - + Export Vyvést - + Reset Nastavit znovu - + Launch at startup Spustit při spuštění - - + + Launch Flameshot Spustit Flameshot - + Show welcome message on launch - + Close application after capture @@ -443,58 +443,58 @@ Stiskněte mezerník pro otevření postranního panelu. Zavřít po vytvoření snímku - + Close after taking a screenshot Zavřít po vytvoření snímku obrazovky - + Copy URL after upload Kopírovat adresu (URL) po nahrání - + Copy URL and close window after upload Po nahrání zkopírovat URL a zavřít okno - + Save image after copy Uložit obrázek po kopírování - + Save image file after copying it Uložit obrázek se souborem po jeho zkopírování - + Save Path Cesta pro ukládání - + Change... Změnit... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder Vyberte složku - + Unable to write to directory. Nelze zapsat do adresáře. @@ -502,27 +502,27 @@ Stiskněte mezerník pro otevření postranního panelu. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Kopírovat adresu (URL) - + URL copied to clipboard. Adresa (URL) zkopírována do schránky. - + Open in browser @@ -535,9 +535,14 @@ Stiskněte mezerník pro otevření postranního panelu. - Uploading Image - Nahrává se obrázek + Nahrává se obrázek + + + + + Uploading Image... + @@ -550,40 +555,56 @@ Stiskněte mezerník pro otevření postranního panelu. - + URL copied to clipboard. Adresa (URL) zkopírována do schránky. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + Chyba + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -601,15 +622,8 @@ Stiskněte mezerník pro otevření postranního panelu. - - Uploading Image - Nahrává se obrázek - - - - Upload image - + Nahrává se obrázek @@ -627,10 +641,16 @@ Stiskněte mezerník pro otevření postranního panelu. Snímek obrazovky zkopírován do schránky. + Deleting image... + + + Uploading Image... + + Copy URL @@ -642,6 +662,7 @@ Stiskněte mezerník pro otevření postranního panelu. Otevřít adresu (URL) + Delete image Smazat obrázek @@ -663,7 +684,7 @@ Stiskněte mezerník pro otevření postranního panelu. ImgurUploader - + Upload to Imgur Nahrát do Imgur @@ -688,7 +709,7 @@ Stiskněte mezerník pro otevření postranního panelu. Obrázek do schránky. - + Unable to open the URL. Nelze otevřít adresu (URL). @@ -1104,7 +1125,7 @@ Možná budete muset napsat před '#' opačné (obrácené) lomítko, Obvykle se Flameshot spouští na pozadí a přidává do oznamovací oblasti panelu ikonu, kterou je ho možné ovládat. - + URL copied to clipboard. Adresa (URL) zkopírována do schránky. @@ -1115,77 +1136,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture Ukončit zachytávání obrazovky - + Screenshot history - + Capture screen - + Show color picker Ukázat volič barev - + Change the tool's thickness Změnit tloušťku nástroje @@ -1271,22 +1292,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. Dostupné zkratky v režimu zachytávání obrazovky. - + Description Popis - + Key Klávesa @@ -1345,92 +1366,92 @@ You can find me in the system tray. Rok (2000) - + Month Name (jan) Název měsíce (led) - + Month Name (january) Název měsíce (leden) - + Month (01-12) Měsíc (01-12) - + Week Day (1-7) Den v týdnu (1-7) - + Week (01-53) Týden (01-53) - + Day Name (mon) Název dne (pon) - + Day Name (monday) Název dne (pondělí) - + Day (01-31) Den (01-31) - + Day of Month (1-31) Den v měsíci (1-31) - + Day (001-366) Den v roce (001-366) - + Time (%H-%M-%S) Čas (%H-%M-%S) - + Time (%H-%M) Čas (%H-%M) - + Hour (00-23) Hodina (00-23) - + Hour (01-12) Hodina (01-12) - + Minute (00-59) Minuta (00-59) - + Second (00-59) Sekunda (00-59) - + Full Date (%m/%d/%y) Celé datum (%m/%d/%y) - + Full Date (%Y-%m-%d) Celé datum (%Y-%m-%d) diff --git a/data/translations/Internationalization_de_DE.ts b/data/translations/Internationalization_de_DE.ts index b7260abe..71a8a2e2 100644 --- a/data/translations/Internationalization_de_DE.ts +++ b/data/translations/Internationalization_de_DE.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> - + Rectangular Region - + Full Screen (All Monitors) - + No Delay - + second - + seconds - + Take new screenshot - + Area: - + Delay: @@ -208,27 +208,27 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. Controller - + &Take Screenshot &Bildschirmaufnahme anfertigen - + &Open Launcher - + &Configuration &Einstellungen - + &About - + &Latest Uploads @@ -237,7 +237,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. &Informationen - + &Quit &Beenden @@ -327,170 +327,170 @@ 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 the side panel button - + Show the side panel toggle button in the capture mode. - - + + 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 - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - + Change... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -498,27 +498,27 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL URL kopieren - + URL copied to clipboard. URL kopiert. - + Open in browser @@ -531,9 +531,14 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. - Uploading Image - Bild hochladen + Bild hochladen + + + + + Uploading Image... + @@ -546,40 +551,56 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. - + URL copied to clipboard. URL kopiert. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + Fehler + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -597,15 +618,8 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. - - Uploading Image - Bild hochladen - - - - Upload image - + Bild hochladen @@ -623,10 +637,16 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. Bildschirmaufnahme in Zwischenablage kopiert. + Deleting image... + + + Uploading Image... + + Copy URL @@ -638,6 +658,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. URL öffnen + Delete image Bild löschen @@ -659,7 +680,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. ImgurUploader - + Upload to Imgur Zu Imgur hochladen @@ -684,7 +705,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. Bild in Zwischenablage. - + Unable to open the URL. Kann URL nicht öffnen. @@ -1090,7 +1111,7 @@ You may need to escape the '#' sign as in '\#FFF' - + URL copied to clipboard. URL kopiert. @@ -1101,77 +1122,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture Auswahl verlassen - + Screenshot history - + Capture screen - + Show color picker Zeige Farbauswahl - + Change the tool's thickness Ändere die Dicke des Werkzeugs @@ -1257,22 +1278,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. Verfügbare Tastenkürzel im Aufnahmemodus. - + Description Beschreibung - + Key Taste @@ -1331,92 +1352,92 @@ You can find me in the system tray. Jahr (2000) - + Month Name (jan) Monatsname (Jan) - + Month Name (january) Monatsname (Januar) - + Month (01-12) Monat (01-12) - + Week Day (1-7) Wochentag (1-7) - + Week (01-53) Woche (01-53) - + Day Name (mon) Wochentag (Mon) - + Day Name (monday) Wochentag (Montag) - + Day (01-31) Tag (01-31) - + Day of Month (1-31) Tag des Monats (1-31) - + Day (001-366) Tag (001-366) - + Time (%H-%M-%S) Zeit (%H-%M-%S) - + Time (%H-%M) Zeit (%H-%M) - + Hour (00-23) Stunde (00-23) - + Hour (01-12) Stunde (01-12) - + Minute (00-59) Minute (00-59) - + Second (00-59) Sekunde (00-59) - + Full Date (%m/%d/%y) Komplettes Datum (%m/%d/%y) - + Full Date (%Y-%m-%d) Komplettes Datum (%Y-%m-%d) diff --git a/data/translations/Internationalization_es.ts b/data/translations/Internationalization_es.ts index 0ac6ef0a..906038b1 100644 --- a/data/translations/Internationalization_es.ts +++ b/data/translations/Internationalization_es.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> - + Rectangular Region - + Full Screen (All Monitors) - + No Delay - + second - + seconds - + Take new screenshot - + Area: - + Delay: @@ -208,27 +208,27 @@ Presiona Espacio para abrir el panel lateral. Controller - + &Take Screenshot &Tomar captura de pantalla - + &Open Launcher - + &Configuration &Configuración - + &About - + &Latest Uploads @@ -237,7 +237,7 @@ Presiona Espacio para abrir el panel lateral. &Información - + &Quit &Salir @@ -327,170 +327,170 @@ 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 the side panel button - + Show the side panel toggle button in the capture mode. - - + + 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 - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - + Change... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -498,27 +498,27 @@ Presiona Espacio para abrir el panel lateral. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Copiar URL - + URL copied to clipboard. URL copiada al portapapeles. - + Open in browser @@ -531,9 +531,14 @@ Presiona Espacio para abrir el panel lateral. - Uploading Image - Subiendo Imagen + Subiendo Imagen + + + + + Uploading Image... + @@ -546,40 +551,56 @@ Presiona Espacio para abrir el panel lateral. - + URL copied to clipboard. URL copiada al portapapeles. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + Error + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -597,15 +618,8 @@ Presiona Espacio para abrir el panel lateral. - - Uploading Image - Subiendo Imagen - - - - Upload image - + Subiendo Imagen @@ -623,10 +637,16 @@ Presiona Espacio para abrir el panel lateral. Captura copiada al portapapeles. + Deleting image... + + + Uploading Image... + + Copy URL @@ -638,6 +658,7 @@ Presiona Espacio para abrir el panel lateral. Abrir URL + Delete image Borrar imagen @@ -659,7 +680,7 @@ Presiona Espacio para abrir el panel lateral. ImgurUploader - + Upload to Imgur Subir a Imgur @@ -684,7 +705,7 @@ Presiona Espacio para abrir el panel lateral. Imagen al Portapapeles. - + Unable to open the URL. No puede abrir la URL. @@ -1056,7 +1077,7 @@ You may need to escape the '#' sign as in '\#FFF' Imposible escribir en - + URL copied to clipboard. URL copiada al portapapeles. @@ -1097,77 +1118,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture Salir de la captura - + Screenshot history - + Capture screen - + Show color picker Mostrar el selector de color - + Change the tool's thickness Cambiar el grosor de la herramienta @@ -1253,22 +1274,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. Atajos disponibles en el modo captura de pantalla. - + Description Descripción - + Key Tecla @@ -1327,92 +1348,92 @@ You can find me in the system tray. Año (2000) - + Month Name (jan) Nombre del Mes (jul) - + Month Name (january) Nombre del Mes (julio) - + Month (01-12) Mes (01-12) - + Week Day (1-7) Día de la Semana (1-7) - + Week (01-53) Semana (01-53) - + Day Name (mon) Nombre del Día (dom) - + Day Name (monday) Nombre del Día (domingo) - + Day (01-31) Día (01-31) - + Day of Month (1-31) Día del Mes (1-31) - + Day (001-366) Día (001-366) - + Time (%H-%M-%S) Tiempo (%H-%M-%S) - + Time (%H-%M) Tiempo (%H-%M) - + Hour (00-23) Hora (00-23) - + Hour (01-12) Hora (01-12) - + Minute (00-59) Minuto (00-59) - + Second (00-59) Segundo (00-59) - + Full Date (%m/%d/%y) Fecha (%m/%d/%y) - + Full Date (%Y-%m-%d) Fecha (%Y-%m-%d) diff --git a/data/translations/Internationalization_eu.ts b/data/translations/Internationalization_eu.ts index 71bd4c2c..c914e982 100644 --- a/data/translations/Internationalization_eu.ts +++ b/data/translations/Internationalization_eu.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> <b>Argazki-modua</b> - + Rectangular Region Eremu laukizuzena - + Full Screen (All Monitors) Pantaila osoa (pantaila guztiak) - + No Delay Atzerapenik ez - + second segundo - + seconds segundo - + Take new screenshot Egin pantaila-argazki berria - + Area: Eremua: - + Delay: Atzerapena: @@ -208,27 +208,27 @@ Sakatu Zuriunea alboko panela irekitzeko. Controller - + &Take Screenshot &Pantaila-argazkia egin - + &Open Launcher &Abiarazlea ireki - + &Configuration &Ezarpenak - + &About &Honi buruz - + &Latest Uploads @@ -237,7 +237,7 @@ Sakatu Zuriunea alboko panela irekitzeko. &Informazioa - + &Quit &Irten @@ -327,114 +327,114 @@ Sakatu Zuriunea alboko panela irekitzeko. GeneneralConf - - + + Import Inportatu - - - - + + + + Error Errorea - + Unable to read file. Ezin da fitxategia irakurri. - - + + Unable to write file. Ezin da fitxategian idatzi. - + Save File Gorde fitxategia - + Confirm Reset Baieztatu berrezartzea - + Are you sure you want to reset the configuration? Ziur ezarpenak berrezarri nahi dituzula? - + Show help message Erakutsi laguntza-mezua - + Show the help message at the beginning in the capture mode. Erakutsi laguntza-mezua argazki-hartze modua irekitzean. - + Show the side panel button Erakutsi aldeko paneleko botoia - + Show the side panel toggle button in the capture mode. Erakutsi aldeko panela erakusteko botoia argazki-hartze moduan. - - + + Show desktop notifications Erakutsi mahaigaineko jakinarazpenak - + Show tray icon Erakutsi ikonoa erretiluan - + Show the systemtray icon Erakutsi ikonoa sistemako erretiluan - + Configuration File Konfigurazio-fitxategia - + Export Esportatu - + Reset Berrezarri - + Launch at startup Abiarazi saio-hasieran - - + + Launch Flameshot Abiarazi Flamsehot - + Show welcome message on launch - + Close application after capture @@ -443,58 +443,58 @@ Sakatu Zuriunea alboko panela irekitzeko. Itxi argazkia egin ostean - + Close after taking a screenshot Itxi pantaila-argazkia egin ostean - + Copy URL after upload Kopiatu URLa igo ostean - + Copy URL and close window after upload Kopiatu URLa eta itxi leihoa igo ostean - + Save image after copy Gorde irudia kopiatu ostean - + Save image file after copying it Gorde irudia fitxategian kopiatu ostean - + Save Path Gordetzeko bidea - + Change... Aldatu... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder Aukeratu karpeta - + Unable to write to directory. Ezin da direktorioan idatzi. @@ -502,27 +502,27 @@ Sakatu Zuriunea alboko panela irekitzeko. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Kopiatu URLa - + URL copied to clipboard. Arbelean kopiatu da URLa. - + Open in browser @@ -535,9 +535,14 @@ Sakatu Zuriunea alboko panela irekitzeko. - Uploading Image - Irudia igotzen + Irudia igotzen + + + + + Uploading Image... + @@ -550,40 +555,56 @@ Sakatu Zuriunea alboko panela irekitzeko. - + URL copied to clipboard. Arbelean kopiatu da URLa. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + Errorea + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -601,15 +622,8 @@ Sakatu Zuriunea alboko panela irekitzeko. - - Uploading Image - Irudia igotzen - - - - Upload image - + Irudia igotzen @@ -627,10 +641,16 @@ Sakatu Zuriunea alboko panela irekitzeko. Arbelean kopiatu da pantaila-argazkia. + Deleting image... + + + Uploading Image... + + Copy URL @@ -642,6 +662,7 @@ Sakatu Zuriunea alboko panela irekitzeko. Ireki URLa + Delete image Ezabatu irudia @@ -663,7 +684,7 @@ Sakatu Zuriunea alboko panela irekitzeko. ImgurUploader - + Upload to Imgur Igo Imgur-era @@ -688,7 +709,7 @@ Sakatu Zuriunea alboko panela irekitzeko. Irudia arbelera. - + Unable to open the URL. Ezin da ireki URLa. @@ -1070,7 +1091,7 @@ Baliteke '#' karakterea ihes egin behar izatea, '\#FFF'n bez Ezin da hemen idatzi: - + URL copied to clipboard. Arbelean kopiatu da URLa. @@ -1115,77 +1136,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture Irten argazki-hartzetik - + Screenshot history - + Capture screen - + Show color picker Erakutsi kolore hautagailua - + Change the tool's thickness Aldatu tresnaren lodiera @@ -1271,22 +1292,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. Argazki-hartze moduan erabili daitezken laster-teklak. - + Description Deskribapena - + Key Tekla @@ -1345,92 +1366,92 @@ You can find me in the system tray. Urtea (2000) - + Month Name (jan) Hilabetearen izena (ira) - + Month Name (january) Hilabetearen izena (iraila) - + Month (01-12) Hilabetea (01-12) - + Week Day (1-7) Asteko eguna (1-7) - + Week (01-53) Astea (01-53) - + Day Name (mon) Egunaren izena (ar.) - + Day Name (monday) Egunaren izena (asteartea) - + Day (01-31) Eguna (01-31) - + Day of Month (1-31) Hilabeteko eguna (1-31) - + Day (001-366) Urteko eguna (001-366) - + Time (%H-%M-%S) Ordua (%H-%M-%S) - + Time (%H-%M) Ordua (%H-%M) - + Hour (00-23) Eguneko ordua (00-23) - + Hour (01-12) Eguneko ordua (01-12) - + Minute (00-59) Minutua (00-59) - + Second (00-59) Segundoa (00-59) - + Full Date (%m/%d/%y) Data (%h/%e/%u) - + Full Date (%Y-%m-%d) Data (%U-%h-%e) diff --git a/data/translations/Internationalization_fr.ts b/data/translations/Internationalization_fr.ts index 9a91935d..830234a8 100644 --- a/data/translations/Internationalization_fr.ts +++ b/data/translations/Internationalization_fr.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> - + Rectangular Region - + Full Screen (All Monitors) - + No Delay - + second - + seconds - + Take new screenshot - + Area: - + Delay: @@ -208,27 +208,27 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Controller - + &Take Screenshot &Capturer l'écran - + &Open Launcher - + &Configuration &Configuration - + &About - + &Latest Uploads @@ -237,7 +237,7 @@ Appuyer sur Espace pour ouvrir le panneau latéral. &Informations - + &Quit &Quitter @@ -327,114 +327,114 @@ 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 the side panel button - + Show the side panel toggle button in the capture mode. - - + + 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 - + Show welcome message on launch - + Close application after capture @@ -443,58 +443,58 @@ Appuyer sur Espace pour ouvrir le panneau latéral. 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 - + Save image after copy - + Save image file after copying it - + Save Path - + Change... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -502,27 +502,27 @@ Appuyer sur Espace pour ouvrir le panneau latéral. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Copier l'URL - + URL copied to clipboard. URL copiée dans le Presse-papier. - + Open in browser @@ -535,9 +535,14 @@ Appuyer sur Espace pour ouvrir le panneau latéral. - Uploading Image - Mise en ligne de l'image + Mise en ligne de l'image + + + + + Uploading Image... + @@ -550,40 +555,56 @@ Appuyer sur Espace pour ouvrir le panneau latéral. - + URL copied to clipboard. URL copiée dans le Presse-papier. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + Erreur + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -601,15 +622,8 @@ Appuyer sur Espace pour ouvrir le panneau latéral. - - Uploading Image - Mise en ligne de l'image - - - - Upload image - + Mise en ligne de l'image @@ -627,10 +641,16 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Capture d'écran copiée dans le Presse-papier. + Deleting image... + + + Uploading Image... + + Copy URL @@ -642,6 +662,7 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Ouvrir l'URL + Delete image @@ -663,7 +684,7 @@ Appuyer sur Espace pour ouvrir le panneau latéral. ImgurUploader - + Upload to Imgur Mettre en ligne vers Imgur @@ -684,7 +705,7 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Image dans le Presse-papier. - + Unable to open the URL. Impossible d'ouvrir l'URL. @@ -1052,7 +1073,7 @@ You may need to escape the '#' sign as in '\#FFF' Impossible d'écrire par dessus - + URL copied to clipboard. URL copiée dans le Presse-papier. @@ -1093,77 +1114,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture Quitter la capture d'écran - + Screenshot history - + Capture screen - + Show color picker Afficher la palette de couleurs - + Change the tool's thickness Changer l'épaisseur des outils @@ -1249,22 +1270,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. Raccourcis disponibles en mode capture d'écran. - + Description Description - + Key Clé @@ -1323,92 +1344,92 @@ You can find me in the system tray. Année (2000) - + Month Name (jan) Nom des Mois (jan) - + Month Name (january) nom des Mois (janvier) - + Month (01-12) Mois (01-12) - + Week Day (1-7) Jour de la Semaine (1-7) - + Week (01-53) Semaine (01-53) - + Day Name (mon) Nom du Jour (lun) - + Day Name (monday) Nom du Jour (lundi) - + Day (01-31) Jour (01-31) - + Day of Month (1-31) Jour du Mois (1-31) - + Day (001-366) Jour de l'année (001-366) - + Time (%H-%M-%S) Heure (%H-%M-%S) - + Time (%H-%M) Heure (%H-%M) - + Hour (00-23) Heure (00-23) - + Hour (01-12) Heure (01-12) - + Minute (00-59) Minute (00-59) - + Second (00-59) Seconde (00-59) - + Full Date (%m/%d/%y) Date (%m/%d/%y) - + Full Date (%Y-%m-%d) Date Complête (%Y-%m-%d) diff --git a/data/translations/Internationalization_hu.ts b/data/translations/Internationalization_hu.ts index 2d08036b..143b4710 100644 --- a/data/translations/Internationalization_hu.ts +++ b/data/translations/Internationalization_hu.ts @@ -457,7 +457,7 @@ Press Space to open the side panel. Uploading Image - Kép felötlése + Kép felötlése Delete image from S3 @@ -495,6 +495,22 @@ Press Space to open the side panel. S3 Creds URL is not found in your configuration file + + Uploading Image... + + + + Retrieving configuration file with s3 creds... + + + + Error + Hiba + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -511,11 +527,7 @@ Press Space to open the side panel. Uploading Image - Kép felötlése - - - Upload image - + Kép felötlése Unable to open the URL. @@ -549,6 +561,10 @@ Press Space to open the side panel. Image to Clipboard. Kép a vágolapra. + + Uploading Image... + + ImgUploaderTool diff --git a/data/translations/Internationalization_it_IT.ts b/data/translations/Internationalization_it_IT.ts index 31409aa7..05b667e6 100644 --- a/data/translations/Internationalization_it_IT.ts +++ b/data/translations/Internationalization_it_IT.ts @@ -64,47 +64,47 @@ CaptureLauncher - + <b>Capture Mode</b> - + Rectangular Region - + Full Screen (All Monitors) - + No Delay - + second - + seconds - + Take new screenshot - + Area: - + Delay: @@ -193,32 +193,32 @@ Press Space to open the side panel. Controller - + &Take Screenshot - + &Open Launcher - + &Configuration - + &About - + &Quit - + &Latest Uploads @@ -308,170 +308,170 @@ 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 the side panel button - + Show the side panel toggle button in the capture mode. - - + + Show desktop notifications - + Show tray icon - + Show the systemtray icon - + Configuration File - + Export - + Reset - + Launch at startup - - + + Launch Flameshot - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - + Change... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -479,27 +479,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL - + URL copied to clipboard. - + Open in browser @@ -513,7 +513,8 @@ Press Space to open the side panel. - Uploading Image + + Uploading Image... @@ -527,40 +528,56 @@ Press Space to open the side panel. - + URL copied to clipboard. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -577,17 +594,6 @@ Press Space to open the side panel. Upload image to S3 - - - - Uploading Image - - - - - Upload image - - Unable to open the URL. @@ -604,10 +610,16 @@ Press Space to open the side panel. + Deleting image... + + + Uploading Image... + + Copy URL @@ -619,6 +631,7 @@ Press Space to open the side panel. + Delete image @@ -640,12 +653,12 @@ Press Space to open the side panel. ImgurUploader - + Upload to Imgur - + Unable to open the URL. @@ -932,7 +945,7 @@ You may need to escape the '#' sign as in '\#FFF' - + URL copied to clipboard. @@ -990,77 +1003,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture - + Screenshot history - + Capture screen - + Show color picker - + Change the tool's thickness @@ -1146,22 +1159,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. - + Description - + Key @@ -1220,92 +1233,92 @@ You can find me in the system tray. - + Month Name (jan) - + Month Name (january) - + Month (01-12) - + Week Day (1-7) - + Week (01-53) - + Day Name (mon) - + Day Name (monday) - + Day (01-31) - + Day of Month (1-31) - + Day (001-366) - + Time (%H-%M-%S) - + Time (%H-%M) - + Hour (00-23) - + Hour (01-12) - + Minute (00-59) - + Second (00-59) - + Full Date (%m/%d/%y) - + Full Date (%Y-%m-%d) diff --git a/data/translations/Internationalization_ja.ts b/data/translations/Internationalization_ja.ts index 373c1fb0..d931281b 100644 --- a/data/translations/Internationalization_ja.ts +++ b/data/translations/Internationalization_ja.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> - + Rectangular Region - + Full Screen (All Monitors) - + No Delay - + second - + seconds - + Take new screenshot - + Area: - + Delay: @@ -208,27 +208,27 @@ Enter を押すと画面をキャプチャー。 Controller - + &Take Screenshot スクリーンショットを撮る(&T) - + &Open Launcher - + &Configuration 設定(&C) - + &About - + &Latest Uploads @@ -237,7 +237,7 @@ Enter を押すと画面をキャプチャー。 情報(&I) - + &Quit 終了(&Q) @@ -327,170 +327,170 @@ 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? 設定をリセットしてもよろしいですか? - + Show the side panel button - + Show the side panel toggle button in the capture mode. - + Configuration File 設定ファイル - + Export エクスポート - + Reset リセット - + Launch at startup スタートアップ時に起動する - - + + Launch Flameshot Flameshot を起動する - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - + Change... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -498,27 +498,27 @@ Enter を押すと画面をキャプチャー。 HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL URL をコピー - + URL copied to clipboard. URL をクリップボードにコピーしました。 - + Open in browser @@ -531,9 +531,14 @@ Enter を押すと画面をキャプチャー。 - Uploading Image - 画像をアップロード中 + 画像をアップロード中 + + + + + Uploading Image... + @@ -546,40 +551,56 @@ Enter を押すと画面をキャプチャー。 - + URL copied to clipboard. URL をクリップボードにコピーしました。 - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + エラー + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -597,15 +618,8 @@ Enter を押すと画面をキャプチャー。 - - Uploading Image - 画像をアップロード中 - - - - Upload image - + 画像をアップロード中 @@ -623,10 +637,16 @@ Enter を押すと画面をキャプチャー。 スクリーンショットをクリップボードにコピーしました。 + Deleting image... + + + Uploading Image... + + Copy URL @@ -638,6 +658,7 @@ Enter を押すと画面をキャプチャー。 URL を開く + Delete image 画像を削除 @@ -659,7 +680,7 @@ Enter を押すと画面をキャプチャー。 ImgurUploader - + Upload to Imgur Imgur にアップロード @@ -684,7 +705,7 @@ Enter を押すと画面をキャプチャー。 画像をクリップボードへ。 - + Unable to open the URL. URL を開けません。 @@ -1052,7 +1073,7 @@ You may need to escape the '#' sign as in '\#FFF' 書き込めません: - + URL copied to clipboard. URL をクリップボードにコピーしました。 @@ -1093,77 +1114,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture キャプチャーを終了する - + Screenshot history - + Capture screen - + Show color picker カラーピッカーを表示する - + Change the tool's thickness ツールの値 (太さや濃さ) を変更する @@ -1249,22 +1270,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. スクリーンキャプチャーモードで利用可能なショートカット。 - + Description 説明 - + Key キー @@ -1323,92 +1344,92 @@ You can find me in the system tray. 年 (2000) - + Month Name (jan) 月 (jan) - + Month Name (january) 月 (january) - + Month (01-12) 月 (01-12) - + Week Day (1-7) 週日 (1-7) - + Week (01-53) 週 (01-53) - + Day Name (mon) 曜日 (月) - + Day Name (monday) 曜日 (月曜日) - + Day (01-31) 日 (01-31) - + Day of Month (1-31) 日 (1-31) - + Day (001-366) 日 (001-366) - + Time (%H-%M-%S) 時刻 (%H-%M-%S) - + Time (%H-%M) 時刻 (%H-%M) - + Hour (00-23) 時 (00-23) - + Hour (01-12) 時 (01-12) - + Minute (00-59) 分 (00-59) - + Second (00-59) 秒 (00-59) - + Full Date (%m/%d/%y) 年月日 (%m/%d/%y) - + Full Date (%Y-%m-%d) 年月日 (%Y-%m-%d) diff --git a/data/translations/Internationalization_ka.ts b/data/translations/Internationalization_ka.ts index e3931166..6ecbf249 100644 --- a/data/translations/Internationalization_ka.ts +++ b/data/translations/Internationalization_ka.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> - + Rectangular Region - + Full Screen (All Monitors) - + No Delay - + second - + seconds - + Take new screenshot - + Area: - + Delay: @@ -204,27 +204,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot - + &Open Launcher - + &Configuration &პარამეტრები - + &About - + &Latest Uploads @@ -233,7 +233,7 @@ Press Space to open the side panel. &ინფორმაცია - + &Quit &გამოსვლა @@ -323,170 +323,170 @@ 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 the side panel button - + Show the side panel toggle button in the capture mode. - - + + Show desktop notifications ცნობების ჩვენება სამუშაო მაგიდაზე - + Show tray icon ხატულის ჩვენება სისტემურ პანელზე - + Show the systemtray icon ხატულის ჩვენება სისტემურ პანელზე - + Configuration File პარამეტრების ფაილი - + Export ექსპორტირება - + Reset განულება - + Launch at startup გაშვება სისტემის ჩატვირთვისას - - + + Launch Flameshot - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - + Change... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -494,27 +494,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL URL-ის კოპირება - + URL copied to clipboard. URL დაკოპირდა გაცვლის ბუფერში. - + Open in browser @@ -527,9 +527,14 @@ Press Space to open the side panel. - Uploading Image - სურათის ატვირთვა + სურათის ატვირთვა + + + + + Uploading Image... + @@ -542,40 +547,56 @@ Press Space to open the side panel. - + URL copied to clipboard. URL დაკოპირდა გაცვლის ბუფერში. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + შეცდომა + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -593,15 +614,8 @@ Press Space to open the side panel. - - Uploading Image - სურათის ატვირთვა - - - - Upload image - + სურათის ატვირთვა @@ -619,10 +633,16 @@ Press Space to open the side panel. სურათი დაკოპირდა გაცვლის ბუფერში. + Deleting image... + + + Uploading Image... + + Copy URL @@ -634,6 +654,7 @@ Press Space to open the side panel. URL-ის გახსნა + Delete image @@ -655,7 +676,7 @@ Press Space to open the side panel. ImgurUploader - + Upload to Imgur Imgur-ზე ატვირთვა @@ -676,7 +697,7 @@ Press Space to open the side panel. სურათის გაცვლის ბუფერში გაგზავნა - + Unable to open the URL. URL-ის გახსნა ვერ მოხერხდა. @@ -1044,7 +1065,7 @@ You may need to escape the '#' sign as in '\#FFF' შემდეგ მისამართზე ჩაწერა ვერ მოხერხდა: - + URL copied to clipboard. URL დაკოპირდა გაცვლის ბუფერში. @@ -1085,77 +1106,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture გადაღებიდან გამოსვლა - + Screenshot history - + Capture screen - + Show color picker ფერის შესარჩევის ჩვენება - + Change the tool's thickness ხელსაწყოს სისქის შეცვლა @@ -1241,22 +1262,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. გადაღების რეჟიმში ხელმისაწვდომი მალსახმობები. - + Description აღწერა - + Key კლავიში @@ -1315,92 +1336,92 @@ You can find me in the system tray. წელი (2000) - + Month Name (jan) თვის სახელი (იან) - + Month Name (january) თვის სახელი (იანვარი) - + Month (01-12) თვე (01-12) - + Week Day (1-7) კვირის დღე (1-7) - + Week (01-53) კვირა (01-53) - + Day Name (mon) დღის სახელი (ორშ) - + Day Name (monday) დღის სახელი (ორშაბათი) - + Day (01-31) დღე (01-31) - + Day of Month (1-31) თვის დღე (1-31) - + Day (001-366) დღე (001-366) - + Time (%H-%M-%S) - + Time (%H-%M) - + Hour (00-23) საათი (00-23) - + Hour (01-12) საათი (01-12) - + Minute (00-59) წუთი (00-59) - + Second (00-59) წამი (00-59) - + Full Date (%m/%d/%y) სრული თარიღი (%m/%d/%y) - + Full Date (%Y-%m-%d) სრული თარიღი (%Y-%m-%d) diff --git a/data/translations/Internationalization_nl.ts b/data/translations/Internationalization_nl.ts index a6ddaf86..ce7dd668 100644 --- a/data/translations/Internationalization_nl.ts +++ b/data/translations/Internationalization_nl.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> - + Rectangular Region - + Full Screen (All Monitors) - + No Delay - + second - + seconds - + Take new screenshot - + Area: - + Delay: @@ -208,27 +208,27 @@ Druk op spatie om het zijpaneel te openen. Controller - + &Take Screenshot Schermafdruk &maken - + &Open Launcher - + &Configuration &Configuratie - + &About - + &Latest Uploads @@ -237,7 +237,7 @@ Druk op spatie om het zijpaneel te openen. &Informatie - + &Quit &Afsluiten @@ -327,170 +327,170 @@ 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 the side panel button - + Show the side panel toggle button in the capture mode. - - + + 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 - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - + Change... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -498,27 +498,27 @@ Druk op spatie om het zijpaneel te openen. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL URL kopiëren - + URL copied to clipboard. URL gekopieerd naar klembord. - + Open in browser @@ -531,9 +531,14 @@ Druk op spatie om het zijpaneel te openen. - Uploading Image - Bezig met uploaden van afbeelding... + Bezig met uploaden van afbeelding... + + + + + Uploading Image... + @@ -546,40 +551,56 @@ Druk op spatie om het zijpaneel te openen. - + URL copied to clipboard. URL gekopieerd naar klembord. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + Fout + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -597,15 +618,8 @@ Druk op spatie om het zijpaneel te openen. - - Uploading Image - Bezig met uploaden van afbeelding... - - - - Upload image - + Bezig met uploaden van afbeelding... @@ -623,10 +637,16 @@ Druk op spatie om het zijpaneel te openen. Schermafdruk gekopieerd naar klembord. + Deleting image... + + + Uploading Image... + + Copy URL @@ -638,6 +658,7 @@ Druk op spatie om het zijpaneel te openen. URL openen + Delete image Afbeelding verwijderen @@ -659,7 +680,7 @@ Druk op spatie om het zijpaneel te openen. ImgurUploader - + Upload to Imgur Uploaden naar Imgur @@ -684,7 +705,7 @@ Druk op spatie om het zijpaneel te openen. Afbeelding naar klembord. - + Unable to open the URL. Kan URL niet openen. @@ -1056,7 +1077,7 @@ You may need to escape the '#' sign as in '\#FFF' Kan niet wegschrijven naar - + URL copied to clipboard. URL gekopieerd naar klembord. @@ -1097,77 +1118,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture Vastleggen afsluiten - + Screenshot history - + Capture screen - + Show color picker Kleurkiezer tonen - + Change the tool's thickness Wijzig de gereedschapsdikte @@ -1254,22 +1275,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. Beschikbare sneltoetsen in de vastlegmodus. - + Description Omschrijving - + Key Toets @@ -1328,92 +1349,92 @@ You can find me in the system tray. Jaar (2000) - + Month Name (jan) Naam van de maand (јаn) - + Month Name (january) Naam van de maand (јаnuari) - + Month (01-12) Maand (01-12) - + Week Day (1-7) Weekdag (1-7) - + Week (01-53) Week (01-53) - + Day Name (mon) Naam van de dag (ma) - + Day Name (monday) Naam van de dag (maandag) - + Day (01-31) Dag (01-31) - + Day of Month (1-31) Dag van de maand (1-31) - + Day (001-366) Dag (001-366) - + Time (%H-%M-%S) Tijd (%H-%M-%S) - + Time (%H-%M) Tijd (%H-%M) - + Hour (00-23) Uur (00-23) - + Hour (01-12) Uur (01-12) - + Minute (00-59) Minuten (00-59) - + Second (00-59) Seconden (00-59) - + Full Date (%m/%d/%y) Volledige datum (%m/%d/%y) - + Full Date (%Y-%m-%d) Volledige datum (%Y-%m-%d) diff --git a/data/translations/Internationalization_nl_NL.ts b/data/translations/Internationalization_nl_NL.ts index 337d1e65..61fb0bfd 100644 --- a/data/translations/Internationalization_nl_NL.ts +++ b/data/translations/Internationalization_nl_NL.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> <b>Opnamemodus</b> - + Rectangular Region Rechthoekige regio - + Full Screen (All Monitors) Volledig scherm (alle monitoren) - + No Delay Geen vertraging - + second seconde - + seconds seconden - + Take new screenshot Maak een nieuwe schermafbeelding - + Area: Gebied: - + Delay: Vertraging: @@ -208,27 +208,27 @@ Druk op de spatiebalk om het zijpaneel te openen. Controller - + &Take Screenshot &Maak een Schermopname - + &Open Launcher &Open Starter - + &Configuration &Configuratie - + &About - + &Latest Uploads @@ -237,7 +237,7 @@ Druk op de spatiebalk om het zijpaneel te openen. &Informatie - + &Quit &Sluiten @@ -327,114 +327,114 @@ Druk op de spatiebalk om het zijpaneel te openen. GeneneralConf - - + + Import Importeren - - - - + + + + Error Fout - + Unable to read file. Bestand kan niet gelezen worden. - - + + 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 u zeker dat u de configuratie opnieuw wilt instellen? - + Show help message Toon helpbericht - + Show the help message at the beginning in the capture mode. Toon het helpbericht aan het begin in de vastlegmodus. - + Show the side panel button - + Show the side panel toggle button in the capture mode. - - + + Show desktop notifications Bureaubladmeldingen weergeven - + Show tray icon Pictogram in het systeemvak weergeven - + Show the systemtray icon Toon het systeemvakpictogram - + Configuration File Configuratie bestand - + Export Exporteren - + Reset Standaardwaarden - + Launch at startup Automatisch opstarten - - + + Launch Flameshot Start Flameshot - + Show welcome message on launch - + Close application after capture @@ -443,58 +443,58 @@ Druk op de spatiebalk om het zijpaneel te openen. Sluit na schermopname - + Close after taking a screenshot Sluit na het maken van een schermopname - + Copy URL after upload Kopieer URL na upload - + Copy URL and close window after upload Kopieer URL en sluit venster na upload - + Save image after copy - + Save image file after copying it - + Save Path - + Change... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -502,27 +502,27 @@ Druk op de spatiebalk om het zijpaneel te openen. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL URL kopiëren - + URL copied to clipboard. URL gekopieerd naar klembord. - + Open in browser @@ -535,9 +535,14 @@ Druk op de spatiebalk om het zijpaneel te openen. - Uploading Image - Afbeelding uploaden + Afbeelding uploaden + + + + + Uploading Image... + @@ -550,40 +555,56 @@ Druk op de spatiebalk om het zijpaneel te openen. - + URL copied to clipboard. URL gekopieerd naar klembord. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + Fout + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -601,15 +622,8 @@ Druk op de spatiebalk om het zijpaneel te openen. - - Uploading Image - Afbeelding uploaden - - - - Upload image - + Afbeelding uploaden @@ -627,10 +641,16 @@ Druk op de spatiebalk om het zijpaneel te openen. Schermafdruk gekopieerd naar klembord. + Deleting image... + + + Uploading Image... + + Copy URL @@ -642,6 +662,7 @@ Druk op de spatiebalk om het zijpaneel te openen. URL Openen + Delete image Afbeelding verwijderen @@ -663,7 +684,7 @@ Druk op de spatiebalk om het zijpaneel te openen. ImgurUploader - + Upload to Imgur Uploaden naar Imgur @@ -688,7 +709,7 @@ Druk op de spatiebalk om het zijpaneel te openen. Afbeelding naar klembord. - + Unable to open the URL. Kan URL niet openen. @@ -1064,7 +1085,7 @@ You may need to escape the '#' sign as in '\#FFF' Geen schrijftoegang tot - + URL copied to clipboard. URL gekopieerd naar klembord. @@ -1105,77 +1126,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture Stop met vastleggen - + Screenshot history - + Capture screen - + Show color picker Toon kleurkiezer - + Change the tool's thickness Wijzig de gereedschapsdikte @@ -1261,22 +1282,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. Beschikbare snelkoppelingen in de schermopnamemodus. - + Description Omschrijving - + Key Toets @@ -1335,92 +1356,92 @@ You can find me in the system tray. Jaar (2000) - + Month Name (jan) Naam van de maand (јаn) - + Month Name (january) Naam van de maand (јаnuari) - + Month (01-12) Maand (01-12) - + Week Day (1-7) Dag van de week (1-7) - + Week (01-53) Week (01-53) - + Day Name (mon) Naam van de dag (ma) - + Day Name (monday) Naam van de dag (maandag) - + Day (01-31) Dag (01-31) - + Day of Month (1-31) Dag van de maand (1-31) - + Day (001-366) Dag (001-366) - + Time (%H-%M-%S) Tijd (%U-%M-%S) - + Time (%H-%M) Tijd (%U-%M) - + Hour (00-23) Uur (00-23) - + Hour (01-12) Uur (01-12) - + Minute (00-59) Minuten (00-59) - + Second (00-59) Seconde (00-59) - + Full Date (%m/%d/%y) Volledige datum (%m/%d/%j) - + Full Date (%Y-%m-%d) Volledige datum (%J-%m-%d) diff --git a/data/translations/Internationalization_pl.ts b/data/translations/Internationalization_pl.ts index 3751eb9b..b472bc9b 100644 --- a/data/translations/Internationalization_pl.ts +++ b/data/translations/Internationalization_pl.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> <b>Tryb przechwytywania</b> - + Rectangular Region Zaznaczony obszar - + Full Screen (All Monitors) Pełny ekran (Wszystkie monitory) - + No Delay Bez opóźnienia - + second sekunda - + seconds sekundy - + Take new screenshot Wykonaj nowy zrzut ekranu - + Area: Obszar: - + Delay: Opóźnienie: @@ -207,27 +207,27 @@ Spacja, aby pokazać panel boczny. Controller - + &Take Screenshot &Zrzut ekranu - + &Open Launcher Pokaż &okno - + &Configuration &Konfiguracja - + &About O progr&amie - + &Latest Uploads @@ -236,7 +236,7 @@ Spacja, aby pokazać panel boczny. &Informacje - + &Quit &Wyjdź @@ -326,114 +326,114 @@ 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 the side panel button - + Show the side panel toggle button in the capture mode. - - + + 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 - + Show welcome message on launch - + Close application after capture @@ -442,58 +442,58 @@ Spacja, aby pokazać panel boczny. Zamknij po wykonaniu zrzutu - + Close after taking a screenshot Zamknij po wykonaniu zrzutu ekranu - + Copy URL after upload Kopiuj adres URL po wysłaniu - + Copy URL and close window after upload Kopiuj adres URL po wysłaniu i zamknij okno - + Save image after copy - + Save image file after copying it - + Save Path - + Change... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -501,27 +501,27 @@ Spacja, aby pokazać panel boczny. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Kopiuj URL - + URL copied to clipboard. URL skopiowany do schowka. - + Open in browser @@ -534,9 +534,14 @@ Spacja, aby pokazać panel boczny. - Uploading Image - Wysyłanie obrazka + Wysyłanie obrazka + + + + + Uploading Image... + @@ -549,40 +554,56 @@ Spacja, aby pokazać panel boczny. - + URL copied to clipboard. URL skopiowany do schowka. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + Błąd + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -600,15 +621,8 @@ Spacja, aby pokazać panel boczny. - - Uploading Image - Wysyłanie obrazka - - - - Upload image - + Wysyłanie obrazka @@ -626,10 +640,16 @@ Spacja, aby pokazać panel boczny. Zrzut ekranu skopiowany do schowka. + Deleting image... + + + Uploading Image... + + Copy URL @@ -641,6 +661,7 @@ Spacja, aby pokazać panel boczny. Otwórz URL + Delete image Usuń obrazek @@ -662,7 +683,7 @@ Spacja, aby pokazać panel boczny. ImgurUploader - + Upload to Imgur Wyślij do Imgur @@ -687,7 +708,7 @@ Spacja, aby pokazać panel boczny. Obrazek do schowka. - + Unable to open the URL. Nie można otworzyć adresu URL. @@ -1063,7 +1084,7 @@ You may need to escape the '#' sign as in '\#FFF' Nie można zapisać w - + URL copied to clipboard. URL skopiowany do schowka. @@ -1108,77 +1129,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture Zakończ przechwytywanie - + Screenshot history - + Capture screen - + Show color picker Pokaż próbnik kolorów - + Change the tool's thickness Zmień grubość narzędzia @@ -1264,22 +1285,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. Dostępne skróty w trybie przechwytywania obrazu. - + Description Działanie - + Key Klawisz @@ -1338,92 +1359,92 @@ You can find me in the system tray. Rok (2000) - + Month Name (jan) Nazwa miesiąca (cze) - + Month Name (january) Nazwa miesiąca (czerwiec) - + Month (01-12) Miesiąc (01-12) - + Week Day (1-7) Dzień tygodnia (1-7) - + Week (01-53) Tydzień (01-53) - + Day Name (mon) Nazwa dniaa (pią) - + Day Name (monday) Nazwa dnia (piątek) - + Day (01-31) Dzień (01-31) - + Day of Month (1-31) Dzień miesiąca (1-31) - + Day (001-366) Dzień (001-366) - + Time (%H-%M-%S) Czas (%H-%M-%S) - + Time (%H-%M) Czas (%H-%M) - + Hour (00-23) Godzina (00-23) - + Hour (01-12) Godzina (01-12) - + Minute (00-59) Minuta (00-59) - + Second (00-59) Sekunda (00-59) - + Full Date (%m/%d/%y) Data (%m/%d/%y) - + Full Date (%Y-%m-%d) Data (%Y-%m-%d) diff --git a/data/translations/Internationalization_pt_BR.ts b/data/translations/Internationalization_pt_BR.ts index 6120968e..ff29c0aa 100644 --- a/data/translations/Internationalization_pt_BR.ts +++ b/data/translations/Internationalization_pt_BR.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> <b>Modo Captura</b> - + Rectangular Region Região Retangular - + Full Screen (All Monitors) Tela Inteira (Todos os Monitores) - + No Delay Sem atraso - + second segundo - + seconds segundos - + Take new screenshot Tirar uma nova screenshot - + Area: Area: - + Delay: Atraso: @@ -208,27 +208,27 @@ Pressione espaço abrir o painel lateral. Controller - + &Take Screenshot &Tirar Screenshot - + &Open Launcher &Abrir carregador - + &Configuration &Configuração - + &About &Sobre - + &Latest Uploads @@ -237,7 +237,7 @@ Pressione espaço abrir o painel lateral. &Informações - + &Quit &Sair @@ -327,114 +327,114 @@ 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 the side panel button Mostrar botão no painel lateral - + Show the side panel toggle button in the capture mode. Mostrar altenador do painel lateral. - - + + 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 - + Show welcome message on launch - + Close application after capture @@ -443,58 +443,58 @@ Pressione espaço abrir o painel lateral. Fechar após captura - + Close after taking a screenshot Fechar após tirar uma screenshot - + Copy URL after upload Copiar URL após upload - + Copy URL and close window after upload Copiar URL e fechar janela após upload - + Save image after copy Salvar imagem após copiar - + Save image file after copying it Salvar imagem após copiar - + Save Path Salvar Caminho - + Change... Alterar... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder Selecione uma pasta - + Unable to write to directory. Não foi possível escrever no diretório. @@ -502,27 +502,27 @@ Pressione espaço abrir o painel lateral. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Copiar URL - + URL copied to clipboard. URL copiada para a área de transferência. - + Open in browser @@ -535,9 +535,14 @@ Pressione espaço abrir o painel lateral. - Uploading Image - Upando Imagem + Upando Imagem + + + + + Uploading Image... + @@ -550,40 +555,56 @@ Pressione espaço abrir o painel lateral. - + URL copied to clipboard. URL copiada para a área de transferência. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + Erro + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -601,15 +622,8 @@ Pressione espaço abrir o painel lateral. - - Uploading Image - Upando Imagem - - - - Upload image - + Upando Imagem @@ -627,10 +641,16 @@ Pressione espaço abrir o painel lateral. Screenshot copiada para a área de transferência. + Deleting image... + + + Uploading Image... + + Copy URL @@ -642,6 +662,7 @@ Pressione espaço abrir o painel lateral. Abrir URL + Delete image Deletar imagem @@ -663,7 +684,7 @@ Pressione espaço abrir o painel lateral. ImgurUploader - + Upload to Imgur Upload no Imgur @@ -688,7 +709,7 @@ Pressione espaço abrir o painel lateral. Imagem na área de transferência. - + Unable to open the URL. Não foi possível abrir a URL. @@ -1104,7 +1125,7 @@ Você pode ter que invalidar o sinal '#', por exemplo '\#FFF&apos Por padrão roda Flameshot no background e adiciona um ícone na bandeija para configuração. - + URL copied to clipboard. URL copiada para a área de transferência. @@ -1115,77 +1136,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture Sair da captura - + Screenshot history - + Capture screen - + Show color picker Mostrar seletor de cores - + Change the tool's thickness Mudar a grossura do pincel @@ -1271,22 +1292,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. Atalhos disponívels na tela de captura. - + Description Descrição - + Key Tecla @@ -1345,92 +1366,92 @@ You can find me in the system tray. Ano (2000) - + Month Name (jan) Nome do mês (jan) - + Month Name (january) Nome do mês (janeiro) - + Month (01-12) Mês (01-12) - + Week Day (1-7) Dia da semana (1-7) - + Week (01-53) Semana (01-53) - + Day Name (mon) Nome do dia (seg) - + Day Name (monday) Nome do dia (segunda) - + Day (01-31) Dia (01-31) - + Day of Month (1-31) Dia do Mês (1-31) - + Day (001-366) Dia (001-366) - + Time (%H-%M-%S) Tempo (%H-%M-%S) - + Time (%H-%M) Tempo (%H-%M) - + Hour (00-23) Hora (00-23) - + Hour (01-12) Hora (01-12) - + Minute (00-59) Minuto (00-59) - + Second (00-59) Segundo (00-59) - + Full Date (%m/%d/%y) Data Completa (%m/%d/%y) - + Full Date (%Y-%m-%d) Data Completa (%Y-%m-%d) diff --git a/data/translations/Internationalization_ru.ts b/data/translations/Internationalization_ru.ts index 77b0a5c0..6743d7c2 100644 --- a/data/translations/Internationalization_ru.ts +++ b/data/translations/Internationalization_ru.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> <b>Режим захвата</b> - + Rectangular Region Прямоугольная область - + Full Screen (All Monitors) Весь экран (все мониторы) - + No Delay Без задержки - + second сек - + seconds сек - + Take new screenshot Сделать новый снимок - + Area: Область: - + Delay: Задержка: @@ -208,27 +208,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot &Сделать снимок - + &Open Launcher &Открыть лаунчер - + &Configuration &Настройка - + &About &Информация - + &Latest Uploads Последние загрузки @@ -237,7 +237,7 @@ Press Space to open the side panel. &Информация - + &Quit &Выход @@ -327,114 +327,114 @@ 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 the side panel button Показывать кнопку боковой панели - + Show the side panel toggle button in the capture mode. Показывать кнопку открытия боковой панели в режиме захвата. - - + + Show desktop notifications Показывать уведомления - + Show tray icon Показывать значок в трее - + Show the systemtray icon Показать значок в системном трее - + Configuration File Файл конфигурации - + Export Экспорт - + Reset Сброс - + Launch at startup Запускать при старте системы - - + + Launch Flameshot Запустить Flameshot - + Show welcome message on launch Показывать приветствие при запуске - + Close application after capture Закрывать приложение после захвата экрана @@ -443,43 +443,43 @@ Press Space to open the side panel. Закрыть после снимка - + Close after taking a screenshot Закрыть после снимка - + Copy URL after upload Копировать URL после загрузки - + Copy URL and close window after upload Копировать URL и закрыть окно после загрузки - + Save image after copy Сохранять изображение после копирования - + Save image file after copying it Сохранять файл изображения после копирования - + Save Path Путь сохранения - + Change... Сменить... - - + + Copy file path after save Скопировать путь к файлу после сохранения @@ -488,17 +488,17 @@ Press Space to open the side panel. Выберите путь по умолчанию для снимков экрана - + Use fixed path for screenshots to save Использовать фиксированный путь для сохранения снимков экрана - + Choose a Folder Выберите папку - + Unable to write to directory. Не удалось записать в папку. @@ -506,27 +506,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads Последние загрузки - + Screenshots history is empty История скриншотов пуста - + Copy URL Скопировать URL - + URL copied to clipboard. URL скопирован в буфер обмена. - + Open in browser Открыть в браузере @@ -539,9 +539,14 @@ Press Space to open the side panel. Загрузка изображения на S3 - Uploading Image - Загрузка изображения + Загрузка изображения + + + + + Uploading Image... + Выгрузка изображения... @@ -554,40 +559,56 @@ Press Space to open the side panel. Удаление изображения... - + URL copied to clipboard. URL скопирован в буфер обмена. - + Unable to remove screenshot from the remote storage. Невозможно удалить снимок экрана из удаленного хранилища. - + Network error Ошибка сети - + Possibly it doesn't exist anymore Возможно, его больше не существует - + Do you want to remove screenshot from local history anyway? Вы все равно хотите удалить скриншот из локальной истории? - + Remove screenshot from history? Удалить скриншот из истории? - + + + Retrieving configuration file with s3 creds... + Получение конфигурационного файла с параметрами доступа к s3... + + + S3 Creds URL is not found in your configuration file S3 Creds URL не найден в вашем файле конфигурации + + + Error + Ошибка + + + + Unable to get s3 credentials, please check your VPN connection and try again + Не удалось получить конфигурацию для s3, проверьте свое VPN-соединение и повторите попытку + ImgS3UploaderTool @@ -605,15 +626,12 @@ Press Space to open the side panel. Загрузить изображение в S3 - - Uploading Image - Загрузка изображения + Загрузка изображения - Upload image - Загрузить изображение + Загрузить изображение @@ -631,10 +649,16 @@ Press Space to open the side panel. Снимок скопирован в буфер обмена. + Deleting image... Удаление изображения... + + + Uploading Image... + Выгрузка изображения... + Copy URL @@ -646,6 +670,7 @@ Press Space to open the side panel. Открыть URL + Delete image Удалить изображение @@ -671,7 +696,7 @@ Press Space to open the side panel. ImgurUploader - + Upload to Imgur Загрузить в Imgur @@ -696,7 +721,7 @@ Press Space to open the side panel. Изображение в буфер обмена. - + Unable to open the URL. Не удалось открыть URL. @@ -1078,7 +1103,7 @@ You may need to escape the '#' sign as in '\#FFF' Не удалось сохранить - + URL copied to clipboard. URL скопирован в буфер обмена. @@ -1120,77 +1145,77 @@ You can find me in the system tray. Вы можете найти меня в системном трее. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. Привет я тут! Щелкните значок на панели задач, чтобы сделать снимок экрана, или щелкните правой кнопкой, чтобы увидеть дополнительные параметры. - + Toggle side panel Вызвать/спрятать боковую панель - + Resize selection left 1px Изменить размер выделения влево на 1 пиксель - + Resize selection right 1px Изменить размер выделения вправо на 1 пиксель - + Resize selection up 1px Изменить размер выделения вверх на 1 пиксель - + Resize selection down 1px Изменить размер выделения вниз на 1 пиксель - + Move selection left 1px Переместить выделение влево на 1 пиксель - + Move selection right 1px Переместить выделение вправо на 1 пиксель - + Move selection up 1px Переместить выделение вверх на 1 пиксель - + Move selection down 1px Переместить выделение вниз на 1 пиксель - + Quit capture Выйти из захвата экрана - + Screenshot history История скриншотов - + Capture screen Захватить экран - + Show color picker Показать выбор цвета - + Change the tool's thickness Изменить толщину инструмента @@ -1276,22 +1301,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys Горячие клавиши - + Available shortcuts in the screen capture mode. Доступные горячие клавиши в режиме захвата экрана. - + Description Описание - + Key Клавиша @@ -1350,92 +1375,92 @@ You can find me in the system tray. Год (2000) - + Month Name (jan) Название месяца (янв) - + Month Name (january) Название месяца (январь) - + Month (01-12) Месяц (01-12) - + Week Day (1-7) День недели (1-7) - + Week (01-53) Неделя (01-53) - + Day Name (mon) День недели (пн) - + Day Name (monday) День недели (понедельник) - + Day (01-31) День (01-31) - + Day of Month (1-31) День месяца (1-31) - + Day (001-366) День (001-366) - + Time (%H-%M-%S) Время (%H-%M-%S) - + Time (%H-%M) Время (%H-%M) - + Hour (00-23) Час (00-23) - + Hour (01-12) Час (01-12) - + Minute (00-59) Минута (00-59) - + Second (00-59) Секунда (00-59) - + Full Date (%m/%d/%y) Полная дата (%m/%d/%y) - + Full Date (%Y-%m-%d) Полная дата (%Y-%m-%d) diff --git a/data/translations/Internationalization_sk.ts b/data/translations/Internationalization_sk.ts index c5917398..7333366e 100644 --- a/data/translations/Internationalization_sk.ts +++ b/data/translations/Internationalization_sk.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> <b>Režim zachytávania</b> - + Rectangular Region Pravouhlá oblasť - + Full Screen (All Monitors) Celá obrazovka (všetky monitory) - + No Delay Bez oneskorenia - + second sekunda - + seconds sekundy - + Take new screenshot Zachytiť novú snímku - + Area: Oblasť: - + Delay: Oneskorenie: @@ -208,27 +208,27 @@ Stlačte medzerník pre otvorenie postranného panelu. Controller - + &Take Screenshot &Vytvoriť snímku - + &Open Launcher - + &Configuration &Konfigurácia - + &About O &programe - + &Latest Uploads @@ -237,7 +237,7 @@ Stlačte medzerník pre otvorenie postranného panelu. &Informácie - + &Quit &Ukončiť @@ -327,114 +327,114 @@ 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 the side panel button Zobraziť tlačidlo na postrannom paneli - + Show the side panel toggle button in the capture mode. V režime zachytávania zobrazovať tlačidlo na postrannom paneli. - - + + 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 - + Show welcome message on launch - + Close application after capture @@ -443,58 +443,58 @@ Stlačte medzerník pre otvorenie postranného panelu. Zavrieť po vytvorení snímky - + Close after taking a screenshot Zatvoriť po vytvorení snímky obrazovky - + Copy URL after upload Kopírovať URL po uploade - + Copy URL and close window after upload Po nahratí skopírovať URL a zavrieť okno - + Save image after copy Uložiť obrázok po kopírovaní - + Save image file after copying it Uložiť obrázok so súborom po jeho skopírovaní - + Save Path Cesta pre ukladanie - + Change... Zmeniť... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder Vyberte priečinok - + Unable to write to directory. Zápis do adresára nie je možný. @@ -502,27 +502,27 @@ Stlačte medzerník pre otvorenie postranného panelu. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Kopírovať URL - + URL copied to clipboard. URL skopírovaná do schránky. - + Open in browser @@ -535,9 +535,14 @@ Stlačte medzerník pre otvorenie postranného panelu. - Uploading Image - Nahrávam obrázok + Nahrávam obrázok + + + + + Uploading Image... + @@ -550,40 +555,56 @@ Stlačte medzerník pre otvorenie postranného panelu. - + URL copied to clipboard. URL skopírovaná do schránky. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + Chyba + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -601,15 +622,8 @@ Stlačte medzerník pre otvorenie postranného panelu. - - Uploading Image - Nahrávam obrázok - - - - Upload image - + Nahrávam obrázok @@ -627,10 +641,16 @@ Stlačte medzerník pre otvorenie postranného panelu. Snímka obrazovky bola skopírovaná do schránky. + Deleting image... + + + Uploading Image... + + Copy URL @@ -642,6 +662,7 @@ Stlačte medzerník pre otvorenie postranného panelu. Otvoriť URL + Delete image Vymazať obrázok @@ -663,7 +684,7 @@ Stlačte medzerník pre otvorenie postranného panelu. ImgurUploader - + Upload to Imgur Nahrať na Imgur @@ -688,7 +709,7 @@ Stlačte medzerník pre otvorenie postranného panelu. Obrázok do schránky. - + Unable to open the URL. Nepodarilo sa otvoriť URL. @@ -1070,7 +1091,7 @@ Možno budete musieť napísať pred '#' opačnú lomku, teda '\# Chyba pri ukladaní - + URL copied to clipboard. URL skopírovaná do schránky. @@ -1115,77 +1136,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture Ukončiť zachytávanie obrazovky - + Screenshot history - + Capture screen - + Show color picker Zobraziť dialóg na výber farby - + Change the tool's thickness Zmena hrúbky nástroja @@ -1271,22 +1292,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. Dostupné klávesové skratky v režime zachytávania obrazovky. - + Description Popis - + Key Kláves @@ -1345,92 +1366,92 @@ You can find me in the system tray. Rok (2000) - + Month Name (jan) Meno mesiaca (jan) - + Month Name (january) Meno mesiaca (január) - + Month (01-12) Mesiac (01-12) - + Week Day (1-7) Deň v týždni (1-7) - + Week (01-53) Týždeň (01-53) - + Day Name (mon) Meno dňa (pon) - + Day Name (monday) Meno dňa (pondelok) - + Day (01-31) Deň (01-31) - + Day of Month (1-31) Deň v mesiaci (1-31) - + Day (001-366) Deň (001-366) - + Time (%H-%M-%S) Čas (%H-%M-%S) - + Time (%H-%M) Čas (%H-%M) - + Hour (00-23) Hodina (00-23) - + Hour (01-12) Hodina (01-12) - + Minute (00-59) Minúta (00-59) - + Second (00-59) Sekunda (00-59) - + Full Date (%m/%d/%y) Celý dátum (%m/%d/%y) - + Full Date (%Y-%m-%d) Celý dátum (%Y-%m-%d) diff --git a/data/translations/Internationalization_sr_SP.ts b/data/translations/Internationalization_sr_SP.ts index 707a544e..202f3957 100644 --- a/data/translations/Internationalization_sr_SP.ts +++ b/data/translations/Internationalization_sr_SP.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> - + Rectangular Region - + Full Screen (All Monitors) - + No Delay - + second - + seconds - + Take new screenshot - + Area: - + Delay: @@ -208,27 +208,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot &Направи снимак екрана - + &Open Launcher - + &Configuration &Подешавања - + &About - + &Latest Uploads @@ -237,7 +237,7 @@ Press Space to open the side panel. Ин&формације - + &Quit &Излаз @@ -327,170 +327,170 @@ 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 the side panel button - + Show the side panel toggle button in the capture mode. - - + + Show desktop notifications Користи системска обавештења - + Show tray icon Иконица на системској полици - + Show the systemtray icon Приказуј иконицу на системској полици - + Configuration File Датотека са подешавањима - + Export Извоз - + Reset Поништи - + Launch at startup Покрени на почетку - - + + Launch Flameshot Покрени Flameshot - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - + Change... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -498,27 +498,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Запамти интернет адресу - + URL copied to clipboard. Интернет адреса је сачувана у привременој меморији. - + Open in browser @@ -531,9 +531,14 @@ Press Space to open the side panel. - Uploading Image - Објављујем слику + Објављујем слику + + + + + Uploading Image... + @@ -546,40 +551,56 @@ Press Space to open the side panel. - + URL copied to clipboard. Интернет адреса је сачувана у привременој меморији. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + Грешка + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -597,15 +618,8 @@ Press Space to open the side panel. - - Uploading Image - Објављујем слику - - - - Upload image - + Објављујем слику @@ -623,10 +637,16 @@ Press Space to open the side panel. Слика је сачувана у привременој меморији. + Deleting image... + + + Uploading Image... + + Copy URL @@ -638,6 +658,7 @@ Press Space to open the side panel. Посети интернет адресу + Delete image Избриши слику @@ -659,7 +680,7 @@ Press Space to open the side panel. ImgurUploader - + Upload to Imgur Објави на Imgur @@ -684,7 +705,7 @@ Press Space to open the side panel. Сачувај у привремену меморију. - + Unable to open the URL. Нисам успео да посетим интернет адресу. @@ -1052,7 +1073,7 @@ You may need to escape the '#' sign as in '\#FFF' Нисам успео са сачувам - + URL copied to clipboard. Интернет адреса је сачувана у привременој меморији. @@ -1093,77 +1114,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture Излаз из снимача екрана - + Screenshot history - + Capture screen - + Show color picker Прикажи избор боје - + Change the tool's thickness Измени дебљину линије алата @@ -1250,22 +1271,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. Доступне пречице у моду снимка екрана. - + Description Опис - + Key Тастер @@ -1324,92 +1345,92 @@ You can find me in the system tray. Година (2000) - + Month Name (jan) Име месеца (јан) - + Month Name (january) Име месеца (јануар) - + Month (01-12) Месец (01-12) - + Week Day (1-7) Дани у недељи (1-7) - + Week (01-53) Недеља (01-53) - + Day Name (mon) Дан у недељи (пон) - + Day Name (monday) Дан у недељи (понедељак) - + Day (01-31) Дан (01-31) - + Day of Month (1-31) Дан месеца (1-31) - + Day (001-366) Дан (001-366) - + Time (%H-%M-%S) Време (%H-%M-%S) - + Time (%H-%M) Време (%H-%M) - + Hour (00-23) Сат (00-23) - + Hour (01-12) Сат (01-12) - + Minute (00-59) Минута (00-59) - + Second (00-59) Секунда (00-59) - + Full Date (%m/%d/%y) Комплетан датум (%m/%d/%y) - + Full Date (%Y-%m-%d) Комплетан датум (%Y-%m-%d) diff --git a/data/translations/Internationalization_sv_SE.ts b/data/translations/Internationalization_sv_SE.ts index 8d0eff1e..4c06d048 100644 --- a/data/translations/Internationalization_sv_SE.ts +++ b/data/translations/Internationalization_sv_SE.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> - + Rectangular Region - + Full Screen (All Monitors) - + No Delay - + second - + seconds - + Take new screenshot - + Area: - + Delay: @@ -208,27 +208,27 @@ Tryck Space för att öppna sidopanelen. Controller - + &Take Screenshot &Ta skärmdump - + &Open Launcher - + &Configuration &Konfiguration - + &About - + &Latest Uploads @@ -237,7 +237,7 @@ Tryck Space för att öppna sidopanelen. &Information - + &Quit &Avsluta @@ -327,170 +327,170 @@ Tryck Space för att öppna sidopanelen. GeneneralConf - - + + Import Importera - - - - + + + + Error Fel - + Unable to read file. Kunde inte läsa filen. - - + + Unable to write file. Kunde inte skriva till filen. - + Save File Spara fil - + Confirm Reset Bekräfta återställning - + Are you sure you want to reset the configuration? Är du säker på att du vill återställa konfigurationen? - + Show help message Visa hjälpmeddelande - + Show the help message at the beginning in the capture mode. Visa hjälpmeddelande vid början av skärmklippsläge. - + Show the side panel button - + Show the side panel toggle button in the capture mode. - - + + Show desktop notifications Visa skrivbordsnotifieringar - + Show tray icon Visa ikon i systemfältet - + Show the systemtray icon Visa ikon i systemfältet - + Configuration File Konfigurationsfil - + Export Exportera - + Reset Återställ - + Launch at startup Starta vid uppstart - - + + Launch Flameshot Starta Flameshot - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - + Change... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -498,27 +498,27 @@ Tryck Space för att öppna sidopanelen. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Kopiera URL - + URL copied to clipboard. URL kopierad till klippbord. - + Open in browser @@ -531,9 +531,14 @@ Tryck Space för att öppna sidopanelen. - Uploading Image - Laddar upp bild + Laddar upp bild + + + + + Uploading Image... + @@ -546,40 +551,56 @@ Tryck Space för att öppna sidopanelen. - + URL copied to clipboard. URL kopierad till klippbord. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + Fel + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -597,15 +618,8 @@ Tryck Space för att öppna sidopanelen. - - Uploading Image - Laddar upp bild - - - - Upload image - + Laddar upp bild @@ -623,10 +637,16 @@ Tryck Space för att öppna sidopanelen. Skärmklipp kopierat till klippbord. + Deleting image... + + + Uploading Image... + + Copy URL @@ -638,6 +658,7 @@ Tryck Space för att öppna sidopanelen. Öppna URL + Delete image Radera bild @@ -659,7 +680,7 @@ Tryck Space för att öppna sidopanelen. ImgurUploader - + Upload to Imgur Ladda upp till Imgur @@ -684,7 +705,7 @@ Tryck Space för att öppna sidopanelen. Bild till klippbord. - + Unable to open the URL. Kunde inte öppna URL. @@ -1086,7 +1107,7 @@ You may need to escape the '#' sign as in '\#FFF' - + URL copied to clipboard. URL kopierad till klippbord. @@ -1097,77 +1118,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture Stäng skärmavbildning - + Screenshot history - + Capture screen - + Show color picker Visa färgväljare - + Change the tool's thickness Ändra verktygets tjocklek @@ -1253,22 +1274,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. Tillgängliga kortkommandon i skärmklippsläge. - + Description Beskrivning - + Key Tangent @@ -1327,92 +1348,92 @@ You can find me in the system tray. År (2000) - + Month Name (jan) Månad namn (jan) - + Month Name (january) Månad namn (januari) - + Month (01-12) Månad (01-12) - + Week Day (1-7) Veckodag (1-7) - + Week (01-53) Vecka (1-53) - + Day Name (mon) Dag namn (mån) - + Day Name (monday) Dag namn (måndag) - + Day (01-31) Dag (01-31) - + Day of Month (1-31) Dag i månad (1-31) - + Day (001-366) Dag (001-366) - + Time (%H-%M-%S) Tid (%H-%M-%S) - + Time (%H-%M) Tid (%H-%M) - + Hour (00-23) Timme (00-23) - + Hour (01-12) Timme (01-12) - + Minute (00-59) Minut (00-59) - + Second (00-59) Sekund (00-59) - + Full Date (%m/%d/%y) Fullständingt datum (%m/%d/%y) - + Full Date (%Y-%m-%d) Fullständigt datum (%Y-%m-%d) diff --git a/data/translations/Internationalization_tr.ts b/data/translations/Internationalization_tr.ts index 3ca1ca6c..a6170d74 100644 --- a/data/translations/Internationalization_tr.ts +++ b/data/translations/Internationalization_tr.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> - + Rectangular Region - + Full Screen (All Monitors) - + No Delay - + second - + seconds - + Take new screenshot - + Area: - + Delay: @@ -208,27 +208,27 @@ Yan paneli açmak için Boşluk tuşuna basın. Controller - + &Take Screenshot &Ekran Resmi Al - + &Open Launcher - + &Configuration &Ayarlar - + &About - + &Latest Uploads @@ -237,7 +237,7 @@ Yan paneli açmak için Boşluk tuşuna basın. &Bilgi - + &Quit &Çıkış @@ -327,170 +327,170 @@ 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 the side panel button - + Show the side panel toggle button in the capture mode. - - + + 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 - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - + Change... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -498,27 +498,27 @@ Yan paneli açmak için Boşluk tuşuna basın. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL URL Kopyala - + URL copied to clipboard. URL panoya kopyalandı. - + Open in browser @@ -531,9 +531,14 @@ Yan paneli açmak için Boşluk tuşuna basın. - Uploading Image - Resim Yükleniyor + Resim Yükleniyor + + + + + Uploading Image... + @@ -546,40 +551,56 @@ Yan paneli açmak için Boşluk tuşuna basın. - + URL copied to clipboard. URL panoya kopyalandı. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + Hata + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -597,15 +618,8 @@ Yan paneli açmak için Boşluk tuşuna basın. - - Uploading Image - Resim Yükleniyor - - - - Upload image - + Resim Yükleniyor @@ -623,10 +637,16 @@ Yan paneli açmak için Boşluk tuşuna basın. Ekran görüntüsü panoya kopyalandı. + Deleting image... + + + Uploading Image... + + Copy URL @@ -638,6 +658,7 @@ Yan paneli açmak için Boşluk tuşuna basın. URL Aç + Delete image Resmi sil @@ -659,7 +680,7 @@ Yan paneli açmak için Boşluk tuşuna basın. ImgurUploader - + Upload to Imgur Imgur'a yükle @@ -684,7 +705,7 @@ Yan paneli açmak için Boşluk tuşuna basın. Resim Pano'ya. - + Unable to open the URL. URL açılamıyor. @@ -1052,7 +1073,7 @@ You may need to escape the '#' sign as in '\#FFF' Yazma mümkün değil - + URL copied to clipboard. URL panoya kopyalandı. @@ -1093,77 +1114,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture Çıkış - + Screenshot history - + Capture screen - + Show color picker Renk seçici göster - + Change the tool's thickness Araç kalınlığını değiştirin @@ -1249,22 +1270,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. Ekran yakalama modunda kullanılabilir kısayollar. - + Description Tanım - + Key Anahtar @@ -1323,92 +1344,92 @@ You can find me in the system tray. Yıl (2000) - + Month Name (jan) Ay Adı (Oca) - + Month Name (january) Ay Adı (Ocak) - + Month (01-12) Ay (01-12) - + Week Day (1-7) Haftanın Günü (1-7) - + Week (01-53) Hafta (01-53) - + Day Name (mon) Gün Adı (pzt) - + Day Name (monday) Gün Adı (pazartesi) - + Day (01-31) Gün (01-31) - + Day of Month (1-31) Ayın Günü (1-31) - + Day (001-366) Gün (001-366) - + Time (%H-%M-%S) - + Time (%H-%M) - + Hour (00-23) Saat (00-23) - + Hour (01-12) Saat (01-12) - + Minute (00-59) Dakika (00-59) - + Second (00-59) Saniye (00-59) - + Full Date (%m/%d/%y) Tam Tarih (%d/%m/%y) - + Full Date (%Y-%m-%d) Tam Tarih (%d-%m-%Y) diff --git a/data/translations/Internationalization_uk.ts b/data/translations/Internationalization_uk.ts index 992235ca..b23fc6a1 100644 --- a/data/translations/Internationalization_uk.ts +++ b/data/translations/Internationalization_uk.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> <b>Режим захвату</b> - + Rectangular Region Прямокутна область - + Full Screen (All Monitors) Весь екран (всі монітори) - + No Delay Без затримки - + second сек - + seconds сек - + Take new screenshot Зробити новий знімок - + Area: Область: - + Delay: Затримка: @@ -208,27 +208,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot &Зробити знімок - + &Open Launcher & Відкрити лаунчер - + &Configuration &Налаштування - + &About Про - + &Latest Uploads Останні завантаження @@ -237,7 +237,7 @@ Press Space to open the side panel. &Інформація - + &Quit Ви&йти @@ -327,114 +327,114 @@ 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 the side panel button Показувати кнопку бічній панелі - + Show the side panel toggle button in the capture mode. Показувати кнопку відкриття бічної панелі в режимі захоплення. - - + + Show desktop notifications Показувати повідомлення - + Show tray icon Показувати значок на панелі - + Show the systemtray icon Показувати значок на панелі повідомленнь - + Configuration File Файл налаштувань - + Export Експорт - + Reset Скинути - + Launch at startup Запускати при старті системи - - + + Launch Flameshot Запускати Flameshot - + Show welcome message on launch Показувати вітання під час запуску - + Close application after capture Закривати програму після захоплення екрану @@ -443,43 +443,43 @@ Press Space to open the side panel. Закрити після знімка - + Close after taking a screenshot Закрити після знімка - + Copy URL after upload Копіювати URL після завантаження - + Copy URL and close window after upload Копіювати URL і закрити вікно після завантаження - + Save image after copy Зберігати зображення після копіювання - + Save image file after copying it Зберігати файл зображення після копіювання - + Save Path Шлях збереження - + Change... Змінити... - - + + Copy file path after save Скопіювати шлях до файлу після збереження @@ -488,17 +488,17 @@ Press Space to open the side panel. Виберіть шлях за замовчуванням для скріншотів - + Use fixed path for screenshots to save Використовувати фіксований шлях для знімків екрана для збереження - + Choose a Folder Обрати папку - + Unable to write to directory. Не вдалося записати в папку. @@ -506,27 +506,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads Останні завантаження - + Screenshots history is empty Історія знімків екрана порожня - + Copy URL Скопіювати URL - + URL copied to clipboard. URL скопійовано до буферу обміну. - + Open in browser Відкрити в браузері @@ -539,9 +539,14 @@ Press Space to open the side panel. Вивантаження зображення на S3 - Uploading Image - Вивантаження зображення + Вивантаження зображення + + + + + Uploading Image... + Вивантаження зображення... @@ -554,40 +559,56 @@ Press Space to open the side panel. Видалення зображення... - + URL copied to clipboard. URL скопійовано до буферу обміну. - + Unable to remove screenshot from the remote storage. Не вдалося видалити знімок екрана з віддаленого сховища. - + Network error Помилка мережі - + Possibly it doesn't exist anymore Можливо, його вже не існує - + Do you want to remove screenshot from local history anyway? Ви все одно хочете видалити знімок екрана з місцевої історії? - + Remove screenshot from history? Видалити знімок екрана з історії? - + + + Retrieving configuration file with s3 creds... + Отримання конфігураційного файлу з параметрами доступу до s3 ... + + + S3 Creds URL is not found in your configuration file S3 Creds URL не знайдено у вашому файлі конфігурації + + + Error + Помилка + + + + Unable to get s3 credentials, please check your VPN connection and try again + Не вдалося отримати конфігурацію для s3, перевірити своє з'єднання VPN і повторити спробу + ImgS3UploaderTool @@ -605,15 +626,12 @@ Press Space to open the side panel. Вивантажити зображення на S3 - - Uploading Image - Вивантаження зображення + Вивантаження зображення - Upload image - Вивантажити зображення + Вивантажити зображення @@ -631,10 +649,16 @@ Press Space to open the side panel. Знімок скопійовано до буферу обміну. + Deleting image... Видалення зображення... + + + Uploading Image... + Вивантаження зображення... + Copy URL @@ -646,6 +670,7 @@ Press Space to open the side panel. Відкрити URL + Delete image Видалити зображення @@ -671,7 +696,7 @@ Press Space to open the side panel. ImgurUploader - + Upload to Imgur Вивантажити до Imgur @@ -696,7 +721,7 @@ Press Space to open the side panel. Зображення до буферу обміну. - + Unable to open the URL. Не вдалось відкрити URL. @@ -1078,7 +1103,7 @@ You may need to escape the '#' sign as in '\#FFF' Не вдалось зберегти - + URL copied to clipboard. URL скопійовано до буферу обміну. @@ -1120,77 +1145,77 @@ You can find me in the system tray. Ви можете знайти мене в системному треї. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. Привіт, я тут! Клацніть піктограму в треї, щоб зробити знімок екрана, або клацніть правою кнопкою, щоб побачити більше опцій. - + Toggle side panel Визвати/сховати бічну панель - + Resize selection left 1px Змінити розмір виділення ліворуч на 1 пікс - + Resize selection right 1px Змінити розмір виділення праворуч на 1 пікс - + Resize selection up 1px Змінити розмір виділення вгору на 1 пікс - + Resize selection down 1px Змінити розмір виділення вниз на 1 пікс - + Move selection left 1px Перемістити виділення вліво на 1 пікс - + Move selection right 1px Перемістити виділення вправо на 1 пікс - + Move selection up 1px Перемістити виділення вгору на 1 пікс - + Move selection down 1px Перемістити виділення вниз на 1 пікс - + Quit capture Вийти із захоплення екрану - + Screenshot history Історія знімків екрану - + Capture screen Захоплення екрану - + Show color picker Показати вибір кольору - + Change the tool's thickness Змінити товщину інструменту @@ -1276,22 +1301,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys Гарячі клавиші - + Available shortcuts in the screen capture mode. Доступні комбінації клавіш у режимі захоплення екрану. - + Description Опис - + Key Клавіша @@ -1350,92 +1375,92 @@ You can find me in the system tray. Рік (2000) - + Month Name (jan) Назва місяця (січ) - + Month Name (january) Назва місяця (січень) - + Month (01-12) Місяць (01-12) - + Week Day (1-7) День тижня (1-7) - + Week (01-53) Тиждень (01-53) - + Day Name (mon) Назва дня тижня (пн) - + Day Name (monday) Назва дня тижня (понеділок) - + Day (01-31) День (01-31) - + Day of Month (1-31) День місяця (1-31) - + Day (001-366) День (001-366) - + Time (%H-%M-%S) Час (%H-%M-%S) - + Time (%H-%M) Час (%H-%M) - + Hour (00-23) Година (00-23) - + Hour (01-12) Година (01-12) - + Minute (00-59) Хвилина (00-59) - + Second (00-59) Секунда (00-59) - + Full Date (%m/%d/%y) Повна дата (%m/%d/%y) - + Full Date (%Y-%m-%d) Повна дата (%Y-%m-%d) diff --git a/data/translations/Internationalization_zh_CN.ts b/data/translations/Internationalization_zh_CN.ts index c67a276f..8988be30 100644 --- a/data/translations/Internationalization_zh_CN.ts +++ b/data/translations/Internationalization_zh_CN.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> <b>捕获模式</b> - + Rectangular Region 方形区域 - + Full Screen (All Monitors) 全屏（所有显示器） - + No Delay 无延迟 - + second 秒 - + seconds 秒 - + Take new screenshot 获取新屏幕截图 - + Area: 区域： - + Delay: 延迟： @@ -209,27 +209,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot 进行截图(&T) - + &Open Launcher 打开启动器(&O) - + &Configuration 配置(&C) - + &About 关于(&A) - + &Latest Uploads @@ -238,7 +238,7 @@ Press Space to open the side panel. 信息(&I) - + &Quit 退出(&Q) @@ -328,114 +328,114 @@ 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? 你确定你想要重置配置？ - + Show the side panel button 显示侧边栏按钮 - + Show the side panel toggle button in the capture mode. 在捕获模式下显示侧边栏切换按钮。 - + Configuration File 配置文件 - + Export 导出 - + Reset 重置 - + Launch at startup 开机时启动 - - + + Launch Flameshot 启动 Flameshot - + Show welcome message on launch - + Close application after capture @@ -444,58 +444,58 @@ Press Space to open the side panel. 捕获后关闭 - + Close after taking a screenshot 获取屏幕截图后关闭 - + Copy URL after upload 上传后复制 URL - + Copy URL and close window after upload 上传后复制 URL 并关闭窗口 - + Save image after copy 复制后保存图像 - + Save image file after copying it 复制到剪贴板后保存图像文件 - + Save Path 保存路径 - + Change... 变更… - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder 选择文件夹 - + Unable to write to directory. 无法写入目录。 @@ -503,27 +503,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL 复制链接 - + URL copied to clipboard. - + Open in browser @@ -536,9 +536,14 @@ Press Space to open the side panel. - Uploading Image - 正在上传 + 正在上传 + + + + + Uploading Image... + @@ -551,40 +556,56 @@ Press Space to open the side panel. - + URL copied to clipboard. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + 错误 + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -602,15 +623,8 @@ Press Space to open the side panel. - - Uploading Image - 正在上传 - - - - Upload image - + 正在上传 @@ -628,10 +642,16 @@ Press Space to open the side panel. 截图复制到剪贴板。 + Deleting image... + + + Uploading Image... + + Copy URL @@ -643,6 +663,7 @@ Press Space to open the side panel. 打开链接 + Delete image 删除图像 @@ -664,7 +685,7 @@ Press Space to open the side panel. ImgurUploader - + Upload to Imgur 上传到Imgur @@ -689,7 +710,7 @@ Press Space to open the side panel. 保存文件到剪贴板。 - + Unable to open the URL. 无法打开此链接。 @@ -1071,7 +1092,7 @@ You may need to escape the '#' sign as in '\#FFF' 无法写入 - + URL copied to clipboard. URL 已复制到剪贴板。 @@ -1116,77 +1137,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture 退出捕获 - + Screenshot history - + Capture screen - + Show color picker 显示颜色选择器 - + Change the tool's thickness 改变工具的厚度 @@ -1272,22 +1293,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. 屏幕捕捉模式中的可用快捷键。 - + Description 描述 - + Key 键 @@ -1346,92 +1367,92 @@ You can find me in the system tray. 年（2000） - + Month Name (jan) 月（1月 - 12月） - + Month Name (january) 月（一月 - 十二月） - + Month (01-12) 月 (01-12) - + Week Day (1-7) 周内的日（1-7） - + Week (01-53) 周（01-53） - + Day Name (mon) 星期（一 - 七） - + Day Name (monday) 星期（星期一 - 星期日） - + Day (01-31) 天（01-31） - + Day of Month (1-31) 一月中的某天（1-31） - + Day (001-366) 天（001-366） - + Time (%H-%M-%S) 时间（%H-%M-%S） - + Time (%H-%M) 时间（%H-%M） - + Hour (00-23) 小时（00-23） - + Hour (01-12) 小时（01-12） - + Minute (00-59) 分钟（00-59） - + Second (00-59) 秒（00-59） - + Full Date (%m/%d/%y) 完整日期（%m/%d/%y） - + Full Date (%Y-%m-%d) 完整日期（%Y-%m-%d） diff --git a/data/translations/Internationalization_zh_HK.ts b/data/translations/Internationalization_zh_HK.ts index a1d38922..113dfd42 100644 --- a/data/translations/Internationalization_zh_HK.ts +++ b/data/translations/Internationalization_zh_HK.ts @@ -4,12 +4,12 @@ AppLauncher - + App Launcher 應用程式啟動器 - + Choose an app to open the capture 選擇一個程式打開此截圖 @@ -32,18 +32,18 @@ 選擇後保持開啟 - - + + Error 錯誤 - + Unable to launch in terminal. 無法從終端啟動。 - + Unable to write in 無法寫入 @@ -51,12 +51,12 @@ ArrowTool - + Arrow 指針 - + Set the Arrow as the paint tool 選取指針作為繪製工具 @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> - + Rectangular Region 矩形區域 - + Full Screen (All Monitors) 满屏（所有顯示器） - + No Delay 無時延 - + second - + seconds - + Take new screenshot 捕獲新截圖 - + Area: - + Delay: @@ -123,12 +123,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. @@ -141,7 +141,7 @@ Press Space to open the side panel. 按Space以打開側方面板。 - + Tool Settings 工具選項 @@ -149,12 +149,12 @@ Press Space to open the side panel. CircleCountTool - + Circle Counter 環狀計數器 - + Add an autoincrementing counter bubble 添加自增計數器 @@ -162,12 +162,12 @@ Press Space to open the side panel. CircleTool - + Circle 環形 - + Set the Circle as the paint tool 選取環形作為繪畫工具 @@ -180,49 +180,64 @@ Press Space to open the side panel. 設定 - + Interface 接口 - + Filename Editor 文檔名稱編輯器 - + General 一般 + + + Shortcuts + + + + + Storage + + Controller - + &Take Screenshot &捕獲截圖 - + &Open Launcher &開啓啓動器 - + &Configuration &設定 - + &About &關於 + + + &Latest Uploads + + &Information &資訊 - + &Quit &結束 @@ -230,12 +245,12 @@ Press Space to open the side panel. CopyTool - + Copy 複製 - + Copy the selection into the clipboard 複製選項到剪貼板 @@ -243,7 +258,7 @@ Press Space to open the side panel. DBusUtils - + Unable to connect via DBus 無法通過 DBus 連接 @@ -251,12 +266,12 @@ Press Space to open the side panel. ExitTool - + Exit 離開 - + Leave the capture screen 離開螢幕擷取 @@ -264,47 +279,47 @@ Press Space to open the side panel. FileNameEditor - + Edit the name of your captures: 編輯您的截圖名稱: - + Edit: 編輯器: - + Preview: 預覽: - + Save 存檔 - + Saves the pattern 儲存樣式 - + Reset 重設 - + Restores the saved pattern 恢復儲存的樣式 - + Clear 清除 - + Deletes the name 刪除這個名稱 @@ -312,215 +327,402 @@ 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? 你確定想要重設？ - + Show the side panel button 顯示側邊欄按鈕 - + Show the side panel toggle button in the capture mode. 在截圖模式下顯示側邊欄切換按鈕。 - + Configuration File 設定文檔 - + Export 導出 - + Reset 重設 - + Launch at startup 自動啟動 - + + Launch Flameshot 啓動Flameshot - - Close after capture - 捕獲截圖后關閉 + + Show welcome message on launch + - + + Close application after capture + + + + Close after capture + 捕獲截圖后關閉 + + + Close after taking a screenshot 進行截屏后關閉 - + Copy URL after upload 上載后複製URL - + Copy URL and close window after upload 上載后複製URL並關閉窗口 - + Save image after copy 複製後保存圖像 - + Save image file after copying it 複製圖像檔案后保存 - + Save Path 保存路徑 - + Change... 變更... - + + Use fixed path for screenshots to save + + + + + + Copy file path after save + + + + Choose a Folder 選取檔案集 - + Unable to write to directory. 無法寫入目錄。 + + HistoryWidget + + + Latest Uploads + + + + + Screenshots history is empty + + + + + Copy URL + 複製連結 + + + + URL copied to clipboard. + + + + + Open in browser + + + + + ImgS3Uploader + + + Upload image to S3 + + + + + + Uploading Image... + + + + + Delete image from S3 + + + + + Deleting image... + + + + + URL copied to clipboard. + + + + + Unable to remove screenshot from the remote storage. + + + + + Network error + + + + + Possibly it doesn't exist anymore + + + + + Do you want to remove screenshot from local history anyway? + + + + + Remove screenshot from history? + + + + + + Retrieving configuration file with s3 creds... + + + + + S3 Creds URL is not found in your configuration file + + + + + Error + 錯誤 + + + + Unable to get s3 credentials, please check your VPN connection and try again + + + + + ImgS3UploaderTool + + + Upload the selection to S3 bucket + + + + + ImgUploader + + + Upload image to S3 + + + + + Uploading Image... + + + + + + Delete image + 刪除圖像 + + + + + Deleting image... + + + + + Unable to open the URL. + 無法打開該URL。 + + + + URL copied to clipboard. + + + + + Screenshot copied to clipboard. + 截圖已複製到剪貼板。 + + + + Copy URL + 複製連結 + + + + Open URL + 打開連結 + + + + Image to Clipboard. + 將檔案複製到剪貼簿。 + + + + ImgUploaderTool + + + Image uploader tool + + + ImgurUploader - + Upload to Imgur 上傳到 Imgur - Uploading Image - 正在上傳 + 正在上傳 - Copy URL - 複製連結 + 複製連結 - Open URL - 打開連結 + 打開連結 - Delete image - 刪除圖像 + 刪除圖像 - Image to Clipboard. - 將檔案複製到剪貼簿。 + 將檔案複製到剪貼簿。 - - + Unable to open the URL. 無法打開該URL。 - URL copied to clipboard. - URL已複製到剪貼板。 + URL已複製到剪貼板。 - Screenshot copied to clipboard. - 截圖已複製到剪貼板。 + 截圖已複製到剪貼板。 ImgurUploaderTool - + Image Uploader 上傳圖片 - + Upload the selection to Imgur 上載到 Imgur @@ -528,110 +730,90 @@ Press Space to open the side panel. InfoWindow - + About 關於 - - SPACEBAR - - - - Right Click - 右鍵 + 右鍵 - Mouse Wheel - 滑鼠滑輪 + 滑鼠滑輪 - Move selection 1px - 移動 1px + 移動 1px - Resize selection 1px - 調整大小 1px + 調整大小 1px - Quit capture - 結束擷取 + 結束擷取 - Copy to clipboard - 複製到剪貼簿 + 複製到剪貼簿 - Save selection as a file - 將選擇範圍另存新檔 + 將選擇範圍另存新檔 - Undo the last modification - 復原上次修改 + 復原上次修改 - Toggle visibility of sidebar with options of the selected tool - 使用所選工具選項切換側邊欄可見性 + 使用所選工具選項切換側邊欄可見性 - Show color picker - 顯示顏色選擇器 + 顯示顏色選擇器 - Change the tool's thickness - 改變工具的寬度 + 改變工具的寬度 - Key - 鍵 + 鍵 - Description - 描述 + 描述 - + <u><b>License</b></u> <u><b>授權條款</b></u> - + <u><b>Version</b></u> <u><b>版本</b></u> - <u><b>Shortcuts</b></u> - <u><b>快速鍵</b></u> + <u><b>快速鍵</b></u> - Available shortcuts in the screen capture mode. - 螢幕捕獲模式中的可用快捷鍵。 + 螢幕捕獲模式中的可用快捷鍵。 LineTool - + Line 直綫 - + Set the Line as the paint tool 將直綫設定為繪畫工具 @@ -639,12 +821,12 @@ Press Space to open the side panel. MarkerTool - + Marker 標記 - + Set the Marker as the paint tool 將標記設定為繪畫工具 @@ -652,12 +834,12 @@ Press Space to open the side panel. MoveTool - + Move 移動 - + Move the selection area 移動選擇區域 @@ -665,12 +847,12 @@ Press Space to open the side panel. PencilTool - + Pencil 鉛筆 - + Set the Pencil as the paint tool 將鉛筆設定為繪畫工具 @@ -678,12 +860,12 @@ Press Space to open the side panel. PinTool - + Pin Tool 固定工具 - + Pin image on the desktop 將圖像固定到桌面 @@ -691,12 +873,12 @@ Press Space to open the side panel. PixelateTool - + Pixelate 馬賽克工具 - + Set Pixelate as the paint tool 將馬賽克工具設定為繪畫工具 @@ -704,18 +886,18 @@ Press Space to open the side panel. QObject - + Save Error 存檔錯誤 - + Capture saved as 截圖已另存為 - + Capture saved to clipboard. 熒幕捕獲已存儲到剪貼板。 @@ -725,122 +907,132 @@ Press Space to open the side panel. 螢幕捕獲已存儲到剪貼板 - - + + Error trying to save as 嘗試另存新檔時發生錯誤 - - - - - + + Save screenshot + + + + + Capture is saved and copied to the clipboard as + + + + + + + + Unable to connect via DBus 無法透過 DBus 進行連接 - + Powerful yet simple to use screenshot software. - + See - + Capture the entire desktop. 捕獲整個桌面。 - + Open the capture launcher. 開啓捕獲啓動器。 - + Start a manual capture in GUI mode. 在GUi模式下開啓手動捕獲。 - + Configure Configure - + Capture a single screen. 捕獲單一熒幕。 - + Path where the capture will be saved - + Save the capture to the clipboard - + Delay time in milliseconds - + Set the filename pattern - + Enable or disable the trayicon - + Enable or disable run at startup - + Show the help message in the capture mode - + Define the main UI color - + Define the contrast UI color - + Print raw PNG capture - + Define the screen to capture - + default: screen containing the cursor - + Screen number - + Invalid color, this flag supports the following formats: - #RGB (each of R, G, and B is a single hex digit) - #RRGGBB @@ -851,37 +1043,37 @@ You may need to escape the '#' sign as in '\#FFF' - + Invalid delay, it must be higher than 0 - + Invalid screen number, it must be non negative - + Invalid path, it must be a real path in the system - + Invalid value, it must be defined as 'true' or 'false' - + Error 錯誤 - + Unable to write in 無法寫入 - + URL copied to clipboard. 連結已複製到剪貼板。 @@ -891,40 +1083,121 @@ You may need to escape the '#' sign as in '\#FFF' 選項 - + Arguments - + arguments - + Usage 使用 - + options 選項 - - Per default runs Flameshot in the background and adds a tray icon for configuration. + + Per default runs Flameshot in the background and adds a tray icon for configuration. + + + Hi, I'm already running! +You can find me in the system tray. + + + + + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. + + + + + Toggle side panel + + + + + Resize selection left 1px + + + + + Resize selection right 1px + + + + + Resize selection up 1px + + + + + Resize selection down 1px + + + + + Move selection left 1px + + + + + Move selection right 1px + + + + + Move selection up 1px + + + + + Move selection down 1px + + + + + Quit capture + 結束擷取 + + + + Screenshot history + + + + + Capture screen + + + + + Show color picker + 顯示顏色選擇器 + + + + Change the tool's thickness + 改變工具的寬度 + RectangleTool - + Rectangle 矩形 - + Set the Rectangle as the paint tool 將矩形設定為繪畫工具 @@ -932,12 +1205,12 @@ You may need to escape the '#' sign as in '\#FFF' RedoTool - + Redo 重做 - + Redo the next modification 重做下一次修改 @@ -945,12 +1218,12 @@ You may need to escape the '#' sign as in '\#FFF' SaveTool - + Save 儲存 - + Save the capture 儲存螢幕捕獲 @@ -958,7 +1231,7 @@ You may need to escape the '#' sign as in '\#FFF' ScreenGrabber - + Unable to capture screen 無法捕獲螢幕 @@ -966,35 +1239,76 @@ You may need to escape the '#' sign as in '\#FFF' SelectionTool - + Rectangular Selection 矩形選擇 - + Set Selection as the paint tool 將矩形選擇設定為繪畫工具 + + SetShortcutDialog + + + Set Shortcut + + + + + Enter new shortcut to change + + + + + Press Esc to cancel or Backspace to disable the keyboard shortcut. + + + + + ShortcutsWidget + + + Hot Keys + + + + + Available shortcuts in the screen capture mode. + 螢幕捕獲模式中的可用快捷鍵。 + + + + Description + 描述 + + + + Key + 鍵 + + SidePanelWidget - + Active thickness: 動態寬度： - + Active color: 動態顔色： - + Press ESC to cancel 按ESC以取消 - + Grab Color 選取顔色 @@ -1002,12 +1316,12 @@ You may need to escape the '#' sign as in '\#FFF' SizeIndicatorTool - + Selection Size Indicator 選擇尺寸指示 - + Show the dimensions of the selection (X Y) 顯示選擇的尺寸 (X Y) @@ -1015,107 +1329,107 @@ You may need to escape the '#' sign as in '\#FFF' StrftimeChooserWidget - + Century (00-99) 世紀(00-99) - + Year (00-99) 年(00-99) - + Year (2000) 年(2000) - + Month Name (jan) 月(jan) - + Month Name (january) 月(january) - + Month (01-12) 月(01-12) - + Week Day (1-7) 工作日(1-7) - + Week (01-53) 周(01-53) - + Day Name (mon) 星期(mon) - + Day Name (monday) 星期(diumenge) - + Day (01-31) 日(01-31) - + Day of Month (1-31) 一月中的某日(1-31) - + Day (001-366) 日(001-366) - + Time (%H-%M-%S) 時間(%H-%M-%S) - + Time (%H-%M) 時間(%H-%M) - + Hour (00-23) 小時(00-23) - + Hour (01-12) 小時(01-12) - + Minute (00-59) 分(00-59) - + Second (00-59) 秒(00-59) - + Full Date (%m/%d/%y) 日期(%m/%d/%y) - + Full Date (%Y-%m-%d) 日期(%Y-%m-%d) @@ -1154,12 +1468,12 @@ You may need to escape the '#' sign as in '\#FFF' TextTool - + Text 文本工具 - + Add text to your capture 往您捕獲的截圖中添加文本 @@ -1172,32 +1486,32 @@ You may need to escape the '#' sign as in '\#FFF' UI 顏色編輯器 - + Change the color moving the selectors and see the changes in the preview buttons. 移動顏色選擇並在預覽按鈕檢視。 - + Select a Button to modify it 選擇一個按鈕以修改 - + Main Color 主色 - + Click on this button to set the edition mode of the main color. 點選按鈕設定主色。 - + Contrast Color 對比色 - + Click on this button to set the edition mode of the contrast color. 點選按鈕設定對比色。 @@ -1205,38 +1519,61 @@ You may need to escape the '#' sign as in '\#FFF' UndoTool - + Undo 撤銷 - + Undo the last modification 撤銷上次修改 + + UploadStorageConfig + + + Upload storage + + + + + Imgur storage + + + + + S3 storage (require config.ini file with s3 credentials) + + + UtilityPanel - + Close 關閉 + + + Hide + + VisualsEditor - + Opacity of area outside selection: 選取區域以外的不透明度： - + Button Selection 按鈕選取 - + Select All 全選 diff --git a/data/translations/Internationalization_zh_TW.ts b/data/translations/Internationalization_zh_TW.ts index dcdca448..8cead83d 100644 --- a/data/translations/Internationalization_zh_TW.ts +++ b/data/translations/Internationalization_zh_TW.ts @@ -75,47 +75,47 @@ CaptureLauncher - + <b>Capture Mode</b> - + Rectangular Region - + Full Screen (All Monitors) - + No Delay - + second - + seconds - + Take new screenshot - + Area: - + Delay: @@ -204,27 +204,27 @@ Press Space to open the side panel. Controller - + &Take Screenshot - + &Open Launcher - + &Configuration &設定 - + &About - + &Latest Uploads @@ -233,7 +233,7 @@ Press Space to open the side panel. &資訊 - + &Quit &結束 @@ -323,170 +323,170 @@ 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? 你確定你想要重設？ - + Show the side panel button - + Show the side panel toggle button in the capture mode. - + Configuration File 設定檔 - + Export 匯出 - + Reset 重設 - + Launch at startup 自動啟動 - - + + Launch Flameshot - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - + Change... - - + + Copy file path after save - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -494,27 +494,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL 複製連結 - + URL copied to clipboard. 連結已複製到剪貼簿 - + Open in browser @@ -527,9 +527,14 @@ Press Space to open the side panel. - Uploading Image - 正在上傳 + 正在上傳 + + + + + Uploading Image... + @@ -542,40 +547,56 @@ Press Space to open the side panel. - + URL copied to clipboard. 連結已複製到剪貼簿 - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + + + Retrieving configuration file with s3 creds... + + + + S3 Creds URL is not found in your configuration file + + + Error + 錯誤 + + + + Unable to get s3 credentials, please check your VPN connection and try again + + ImgS3UploaderTool @@ -593,15 +614,8 @@ Press Space to open the side panel. - - Uploading Image - 正在上傳 - - - - Upload image - + 正在上傳 @@ -619,10 +633,16 @@ Press Space to open the side panel. 截圖已複製到剪貼簿 + Deleting image... + + + Uploading Image... + + Copy URL @@ -634,6 +654,7 @@ Press Space to open the side panel. 打開連結 + Delete image @@ -655,7 +676,7 @@ Press Space to open the side panel. ImgurUploader - + Upload to Imgur 上傳到 Imgur @@ -676,7 +697,7 @@ Press Space to open the side panel. 將檔案複製到剪貼簿 - + Unable to open the URL. 無法打開此連結 @@ -1044,7 +1065,7 @@ You may need to escape the '#' sign as in '\#FFF' 無法寫入 - + URL copied to clipboard. 連結已複製到剪貼簿 @@ -1085,77 +1106,77 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. - + Toggle side panel - + Resize selection left 1px - + Resize selection right 1px - + Resize selection up 1px - + Resize selection down 1px - + Move selection left 1px - + Move selection right 1px - + Move selection up 1px - + Move selection down 1px - + Quit capture 結束擷取 - + Screenshot history - + Capture screen - + Show color picker 顯示顏色選擇器 - + Change the tool's thickness 改變工具的寬度 @@ -1241,22 +1262,22 @@ You can find me in the system tray. ShortcutsWidget - + Hot Keys - + Available shortcuts in the screen capture mode. 螢幕擷取模式中的可用快速鍵 - + Description 描述 - + Key 鍵 @@ -1315,92 +1336,92 @@ You can find me in the system tray. 年 (2000) - + Month Name (jan) 月 (jul) - + Month Name (january) 月 (juliol) - + Month (01-12) 月 (01-12) - + Week Day (1-7) 平常日 (1-7) - + Week (01-53) 周 (01-53) - + Day Name (mon) 星期 (dg) - + Day Name (monday) 星期 (diumenge) - + Day (01-31) 天 (01-31) - + Day of Month (1-31) 一月中的某天 (1-31) - + Day (001-366) 天 (001-366) - + Time (%H-%M-%S) - + Time (%H-%M) - + Hour (00-23) 小時 (00-23) - + Hour (01-12) 小時 (01-12) - + Minute (00-59) 分鐘 (00-59) - + Second (00-59) 秒 (00-59) - + Full Date (%m/%d/%y) 日期 (%m/%d/%y) - + Full Date (%Y-%m-%d) 日期 (%Y-%m-%d) diff --git a/src/config/uploadstorageconfig.cpp b/src/config/uploadstorageconfig.cpp index bd3d3c6b..d256564e 100644 --- a/src/config/uploadstorageconfig.cpp +++ b/src/config/uploadstorageconfig.cpp @@ -48,8 +48,8 @@ UploadStorageConfig::UploadStorageConfig(QWidget* parent) }); StorageManager storageManager; - if (storageManager.storageLocked()) { - ConfigHandler().setUploadStorage(storageManager.storageDefault()); + if (!storageManager.storageLocked().isEmpty()) { + ConfigHandler().setUploadStorage(storageManager.storageLocked()); storageImgUr->setDisabled(true); storageImgS3->setDisabled(true); } diff --git a/src/tools/storage/imguploader.cpp b/src/tools/storage/imguploader.cpp index 92597dbd..ef76244d 100644 --- a/src/tools/storage/imguploader.cpp +++ b/src/tools/storage/imguploader.cpp @@ -43,13 +43,13 @@ ImgUploader::ImgUploader(const QPixmap& capture, QWidget* parent) : QWidget(parent) , m_pixmap(capture) { - init(tr("Upload image to S3"), tr("Uploading Image")); + init(tr("Upload image to S3"), tr("Uploading Image...")); } ImgUploader::ImgUploader(QWidget* parent) : QWidget(parent) { - init(tr("Upload image"), tr("Uploading Image")); + init(tr("Delete image"), tr("Deleting image...")); } void ImgUploader::init(const QString& title, const QString& label) diff --git a/src/tools/storage/s3/amazon-server-side/doc/README.md b/src/tools/storage/s3/amazon-server-side/doc/README.md index 8e7107f0..146e0d8f 100644 --- a/src/tools/storage/s3/amazon-server-side/doc/README.md +++ b/src/tools/storage/s3/amazon-server-side/doc/README.md @@ -22,7 +22,7 @@ if (m_s3Settings.xApiKey().length() > 0) { QByteArray("X-API-Key"), QByteArray(m_s3Settings.xApiKey().toLocal8Bit())); } -m_NetworkAMGetCreds->get(requestCreds); +m_networkAMGetCreds->get(requestCreds); ``` Shell example: @@ -108,7 +108,7 @@ void ImgS3Uploader::uploadToS3(QJsonDocument& response) QNetworkRequest request(qUrl); // upload - m_NetworkAMUpload->post(request, multiPart); + m_networkAMUpload->post(request, multiPart); } ``` @@ -131,5 +131,5 @@ m_deleteToken = deleteToken; request.setUrl(m_s3Settings.credsUrl().toUtf8() + fileName); request.setRawHeader("X-API-Key", m_s3Settings.xApiKey().toLatin1()); request.setRawHeader("Authorization", "Bearer " + deleteToken.toLatin1()); -m_NetworkAMRemove->deleteResource(request); +m_networkAMRemove->deleteResource(request); ``` diff --git a/src/tools/storage/s3/config-examples/config.ini b/src/tools/storage/s3/config-examples/config.ini new file mode 100644 index 00000000..db7d3df4 --- /dev/null +++ b/src/tools/storage/s3/config-examples/config.ini @@ -0,0 +1,11 @@ +[General] +; Lock storage selection for the enterprise users +; (it will lock to the default storage) +STORAGE_LOCKED=s3 +STORAGE_CONFIG_URL="https://git.example.com/repos/flameshot_config/raw/config.ini" + + +[S3] +S3_URL=https://img.example.com/ +S3_CREDS_URL=https://api.img.example.com/ +S3_X_API_KEY= diff --git a/src/tools/storage/s3/config-examples/config_proxy.ini b/src/tools/storage/s3/config-examples/config_proxy.ini new file mode 100644 index 00000000..979fe04c --- /dev/null +++ b/src/tools/storage/s3/config-examples/config_proxy.ini @@ -0,0 +1,16 @@ +[General] +; PROXY SETTINGS +HTTP_PROXY_HOST=0.0.0.0 +HTTP_PROXY_PORT=3128 + +; No authentification USER and PASSWORD should be empty +;HTTP_PROXY_USER= +;HTTP_PROXY_PASSWORD= + +HTTP_PROXY_TYPE=3 +; Proxy Types (3 is default): +; 0 Proxy is determined based on the application proxy set using setApplicationProxy() +; 1 Socks5 proxying is used +; 3 HTTP transparent proxying is used +; 4 Proxying for HTTP requests only +; 5 Proxying for FTP requests only diff --git a/src/tools/storage/s3/imgs3settings.cpp b/src/tools/storage/s3/imgs3settings.cpp index 351ac9a1..dad9e750 100644 --- a/src/tools/storage/s3/imgs3settings.cpp +++ b/src/tools/storage/s3/imgs3settings.cpp @@ -1,45 +1,187 @@ #include "imgs3settings.h" +#include "src/tools/storage/imgstorages.h" +#include "src/utils/confighandler.h" +#include +#include #include +#include #include +#include +#include +#include +#include +#include #include +#include +#include -ImgS3Settings::ImgS3Settings() +ImgS3Settings::ImgS3Settings(QObject* parent) + : QObject(parent) { + m_proxy = nullptr; + m_networkConfig = nullptr; initSettings(); - // get s3 credentials - m_settings->beginGroup("S3"); - m_credsUrl = m_settings->value("S3_CREDS_URL").toString(); - m_credsUrl = - m_credsUrl + - ((m_credsUrl.length() > 0 && m_credsUrl[m_credsUrl.length() - 1] == '/') - ? "" - : "/") + - S3_API_IMG_PATH; + // get remote config url + if (m_localSettings->contains("STORAGE_CONFIG_URL")) { + m_s3ConfigUrl = + QUrl(m_localSettings->value("STORAGE_CONFIG_URL").toString()); + } else { + // set default value if STORAGE_CONFIG_URL not found in the config.ini + m_s3ConfigUrl = QUrl("https://git.namecheap.net/projects/RND/repos/" + "flameshot_config/raw/config.ini"); + } - m_xApiKey = m_settings->value("S3_X_API_KEY").toString(); - - m_url = m_settings->value("S3_URL").toString(); - m_url = - m_url + - ((m_url.length() > 0 && m_url[m_url.length() - 1] == '/') ? "" : "/"); - - m_settings->endGroup(); + // proxy settings + m_proxyType = -1; + m_proxyHost = QString(); + m_proxyPort = -1; + m_proxyUser = QString(); + m_proxyPassword = QString(); } -QSettings* ImgS3Settings::settings() +void ImgS3Settings::initS3Creds() { - return m_settings; + ConfigHandler configHandler; + m_credsUrl = configHandler.value("S3", "S3_CREDS_URL").toString(); + m_xApiKey = configHandler.value("S3", "S3_X_API_KEY").toString(); + m_url = configHandler.value("S3", "S3_URL").toString(); + normalizeS3Creds(); + updateConfigFromRemote(); } -void ImgS3Settings::initSettings() +bool ImgS3Settings::getConfigRemote(int timeout) +{ + if (!m_url.isEmpty() && !m_credsUrl.isEmpty()) { + updateConfigFromRemote(); + return true; + } + QNetworkAccessManager* networkConfig = new QNetworkAccessManager(this); + if (proxy() != nullptr) { + networkConfig->setProxy(*m_proxy); + } + QNetworkReply* reply = networkConfig->get(QNetworkRequest(m_s3ConfigUrl)); + + QEventLoop loop; + QTimer timer; + timer.setSingleShot(true); + connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit())); + connect(reply, SIGNAL(readyRead()), &loop, SLOT(quit())); + timer.start(timeout * 1000); // 30 secs. timeout + loop.exec(); + QString data = QString(reply->readAll()); + parseConfigurationData(data); + + delete reply; + delete networkConfig; + + return !data.isEmpty(); +} + +void ImgS3Settings::parseConfigurationData(const QString& data) +{ + // read remote and save to the temporary file + QTemporaryFile file; + file.open(); + QTextStream stream(&file); + stream << data; + stream.flush(); + + // parse and get configuration data + QSettings remoteConfig(file.fileName(), QSettings::IniFormat, this); + remoteConfig.beginGroup("S3"); + m_url = remoteConfig.value("S3_URL").toString(); + m_credsUrl = remoteConfig.value("S3_CREDS_URL").toString(); + m_xApiKey = remoteConfig.value("S3_X_API_KEY").toString(); + normalizeS3Creds(); + remoteConfig.endGroup(); + + // close and remove temporary file + file.close(); + + // cache configuration at the local storage + ConfigHandler configHandler; + configHandler.setValue("S3", "S3_URL", m_url); + configHandler.setValue("S3", "S3_CREDS_URL", m_credsUrl); + configHandler.setValue("S3", "S3_X_API_KEY", m_xApiKey); + + // set last update date + QString currentDateTime = + QDateTime::currentDateTime().toString(Qt::ISODate); + configHandler.setValue("S3", "S3_CREDS_UPDATED", QVariant(currentDateTime)); +} + +void ImgS3Settings::normalizeS3Creds() +{ + if (!m_url.isEmpty() && m_url.right(1) != "/") { + m_url += "/"; + } + if (!m_credsUrl.isEmpty() && m_credsUrl.right(1) != "/") { + m_credsUrl += "/"; + } +} + +void ImgS3Settings::updateConfigFromRemote() +{ + // check for outdated s3 creds + ConfigHandler configHandler; + QString credsUpdated = + configHandler.value("S3", "S3_CREDS_UPDATED").toString(); + QDateTime dtCredsUpdated = + QDateTime::currentDateTime().fromString(credsUpdated, Qt::ISODate); + QDateTime now = QDateTime::currentDateTime(); + dtCredsUpdated = dtCredsUpdated.addDays(1); + if (dtCredsUpdated <= now) { + // Do update config from remote + if (nullptr == m_networkConfig) { + m_networkConfig = new QNetworkAccessManager(this); + if (proxy() != nullptr) { + m_networkConfig->setProxy(*m_proxy); + } + connect(m_networkConfig, + &QNetworkAccessManager::finished, + this, + &ImgS3Settings::handleReplyUpdateConfigFromRemote); + } + m_networkConfig->get(QNetworkRequest(m_s3ConfigUrl)); + } +} + +void ImgS3Settings::handleReplyUpdateConfigFromRemote(QNetworkReply* reply) +{ + if (reply->error() == QNetworkReply::NoError) { + QString configData = QString(reply->readAll()); + parseConfigurationData(configData); + } else { + QString reason = + reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute) + .toString(); + QString error = reply->errorString(); + qWarning() << "Update config from remote status:" << error; + qWarning() << reason; + } +} + +const QString& ImgS3Settings::storageLocked() +{ + if (m_localSettings->contains("STORAGE_LOCKED")) { + m_storageLocked = + m_localSettings->value(QStringLiteral("STORAGE_LOCKED")).toString(); + } else { + // FIXME - remove hardcode and add configuration file to the + // installation + m_storageLocked = SCREENSHOT_STORAGE_TYPE_S3; + } + return m_storageLocked; +} + +const QString& ImgS3Settings::localConfigFilePath(const QString& fileName) { // get s3 settings - QString configIniPath = QDir(QDir::currentPath()).filePath("config.ini"); - if (!(QFileInfo::exists(configIniPath) && - QFileInfo(configIniPath).isFile())) { + m_qstr = QDir(QDir::currentPath()).filePath(fileName); + if (!(QFileInfo::exists(m_qstr) && QFileInfo(m_qstr).isFile())) { #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) - configIniPath = "/etc/flameshot/config.ini"; + m_qstr = "/etc/flameshot/" + fileName; #elif defined(Q_OS_WIN) // calculate workdir for flameshot on startup if is not set yet QSettings bootUpSettings( @@ -47,23 +189,165 @@ void ImgS3Settings::initSettings() "USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", QSettings::NativeFormat); QFileInfo fi(bootUpSettings.value("Flameshot").toString()); - configIniPath = QDir(fi.absolutePath()).filePath("config.ini"); + m_qstr = QDir(fi.absolutePath()).filePath(fileName); #endif } - m_settings = new QSettings(configIniPath, QSettings::IniFormat); + return m_qstr; +} + +void ImgS3Settings::initSettings() +{ + m_localSettings = + new QSettings(localConfigFilePath(S3_CONFIG_LOCAL), QSettings::IniFormat); + m_proxySettings = + new QSettings(localConfigFilePath(S3_CONFIG_PROXY), QSettings::IniFormat); } const QString& ImgS3Settings::credsUrl() { + if (m_credsUrl.isEmpty()) { + initS3Creds(); + if (!m_credsUrl.isEmpty()) { + m_credsUrl += S3_API_IMG_PATH; + } + } return m_credsUrl; } const QString& ImgS3Settings::xApiKey() { + if (m_xApiKey.isEmpty()) { + initS3Creds(); + } return m_xApiKey; } const QString& ImgS3Settings::url() { + if (m_url.isEmpty()) { + initS3Creds(); + } return m_url; } + +QNetworkProxy* ImgS3Settings::proxy() +{ + if (proxyHost().length() > 0) { + m_proxy = new QNetworkProxy(); + switch (proxyType()) { + case 0: + m_proxy->setType(QNetworkProxy::DefaultProxy); + break; + case 1: + m_proxy->setType(QNetworkProxy::Socks5Proxy); + break; + case 2: + m_proxy->setType(QNetworkProxy::NoProxy); + break; + case 4: + m_proxy->setType(QNetworkProxy::HttpCachingProxy); + break; + case 5: + m_proxy->setType(QNetworkProxy::FtpCachingProxy); + break; + case 3: + default: + m_proxy->setType(QNetworkProxy::HttpProxy); + break; + } + m_proxy->setHostName(proxyHost()); + m_proxy->setPort(proxyPort()); + if (proxyUser().length() > 0) { + m_proxy->setUser(proxyUser()); + m_proxy->setPassword(proxyPassword()); + } + + } else { + // Get proxy settings from OS settings + QNetworkProxyQuery q(QUrl(credsUrl().toUtf8())); + q.setQueryType(QNetworkProxyQuery::UrlRequest); + q.setProtocolTag("http"); + + QList proxies = + QNetworkProxyFactory::systemProxyForQuery(q); + if (proxies.size() > 0 && proxies[0].type() != QNetworkProxy::NoProxy) { + m_proxy = new QNetworkProxy(); + m_proxy->setHostName(proxies[0].hostName()); + m_proxy->setPort(proxies[0].port()); + m_proxy->setType(proxies[0].type()); + m_proxy->setUser(proxies[0].user()); + m_proxy->setPassword(proxies[0].password()); + } + } + return m_proxy; +} + +void ImgS3Settings::clearProxy() +{ + if (m_proxy != nullptr) { + delete m_proxy; + m_proxy = nullptr; + } +} + +int ImgS3Settings::proxyType() +{ + if (-1 == m_proxyType) { + m_proxyType = 3; // default - HTTP transparent proxying is used + if (m_proxySettings->contains("HTTP_PROXY_TYPE")) { + m_proxyType = m_proxySettings->value("HTTP_PROXY_TYPE").toInt(); + if (m_proxyType < 0 || m_proxyType > 5) { + m_proxyType = 3; // default - HTTP transparent proxying is used + } + } + } + return m_proxyType; +} + +const QString& ImgS3Settings::proxyHost() +{ + if (m_proxyHost.isNull()) { + if (m_proxySettings->contains("HTTP_PROXY_HOST")) { + m_proxyHost = m_proxySettings->value("HTTP_PROXY_HOST").toString(); + } else { + m_proxyHost = ""; + } + } + return m_proxyHost; +} + +int ImgS3Settings::proxyPort() +{ + if (-1 == m_proxyPort) { + m_proxyPort = 3128; + if (m_proxySettings->contains("HTTP_PROXY_PORT")) { + m_proxyPort = m_proxySettings->value("HTTP_PROXY_PORT").toInt(); + } + } + return m_proxyPort; +} + +const QString& ImgS3Settings::proxyUser() +{ + if (m_proxyUser.isNull()) { + if (m_proxySettings->contains("HTTP_PROXY_USER")) { + m_proxyUser = m_proxySettings->value("HTTP_PROXY_USER").toString(); + } else { + m_proxyUser = ""; + } + } + return m_proxyUser; +} + +const QString& ImgS3Settings::proxyPassword() +{ + if (m_proxyPassword.isNull()) { + if (m_proxySettings->contains("HTTP_PROXY_PASSWORD")) { + m_proxyPassword = + m_proxySettings->value("HTTP_PROXY_PASSWORD").toString(); + } else { + m_proxyPassword = ""; + } + } + return m_proxyPassword; +} diff --git a/src/tools/storage/s3/imgs3settings.h b/src/tools/storage/s3/imgs3settings.h index 3fce40e4..ac1d0556 100644 --- a/src/tools/storage/s3/imgs3settings.h +++ b/src/tools/storage/s3/imgs3settings.h @@ -1,30 +1,79 @@ -#ifndef IMGS3SETTINGS_H -#define IMGS3SETTINGS_H +#ifndef IMG_S3_SETTINGS_H +#define IMG_S3_SETTINGS_H #define S3_API_IMG_PATH "v2/image/" +#define S3_GET_REMOTE_SETTINGS_TIMEOUT 10 +#define S3_CONFIG_LOCAL "config.ini" +#define S3_CONFIG_PROXY "config_proxy.ini" + +#include #include +#include class QSettings; +class QNetworkProxy; +class QNetworkAccessManager; +class QNetworkRequest; +class QNetworkReply; -class ImgS3Settings +class ImgS3Settings : public QObject { + Q_OBJECT + +private slots: + void handleReplyUpdateConfigFromRemote(QNetworkReply* reply); + public: - ImgS3Settings(); + ImgS3Settings(QObject* parent = nullptr); + + bool getConfigRemote(int timeout = S3_GET_REMOTE_SETTINGS_TIMEOUT); + void updateConfigFromRemote(); + + const QString& storageLocked(); const QString& credsUrl(); const QString& xApiKey(); const QString& url(); - QSettings* settings(); + + QNetworkProxy* proxy(); + void clearProxy(); private: + int proxyType(); + const QString& proxyHost(); + int proxyPort(); + const QString& proxyUser(); + const QString& proxyPassword(); + void initSettings(); + const QString& localConfigFilePath(const QString& fileName); + void parseConfigurationData(const QString& data); + void initS3Creds(); + void normalizeS3Creds(); // class members - QSettings* m_settings; + QSettings* m_localSettings; + QString m_storageLocked; + QString m_qstr; + + // s3 + QUrl m_s3ConfigUrl; QString m_credsUrl; QString m_xApiKey; QString m_url; + + // proxy + QNetworkProxy* m_proxy; + QSettings* m_proxySettings; + int m_proxyType; + QString m_proxyHost; + int m_proxyPort; + QString m_proxyUser; + QString m_proxyPassword; + + // + QNetworkAccessManager* m_networkConfig; }; -#endif // IMGS3SETTINGS_H +#endif // IMG_S3_SETTINGS_H diff --git a/src/tools/storage/s3/imgs3uploader.cpp b/src/tools/storage/s3/imgs3uploader.cpp index 6012121a..5795f3b8 100644 --- a/src/tools/storage/s3/imgs3uploader.cpp +++ b/src/tools/storage/s3/imgs3uploader.cpp @@ -17,7 +17,6 @@ // along with Flameshot. If not, see . #include "imgs3uploader.h" -#include "imgs3settings.h" #include "src/core/controller.h" #include "src/utils/confighandler.h" #include "src/utils/history.h" @@ -41,13 +40,14 @@ #include #include #include +#include #include #include ImgS3Uploader::ImgS3Uploader(const QPixmap& capture, QWidget* parent) : ImgUploader(capture, parent) { - init(tr("Upload image to S3"), tr("Uploading Image")); + init(tr("Upload image to S3"), tr("Uploading Image...")); } ImgS3Uploader::ImgS3Uploader(QWidget* parent) @@ -63,10 +63,10 @@ ImgS3Uploader::~ImgS3Uploader() void ImgS3Uploader::init(const QString& title, const QString& label) { - m_proxy = nullptr; - m_NetworkAMUpload = nullptr; - m_NetworkAMGetCreds = nullptr; - m_NetworkAMRemove = nullptr; + m_multiPart = nullptr; + m_networkAMUpload = nullptr; + m_networkAMGetCreds = nullptr; + m_networkAMRemove = nullptr; resultStatus = false; setWindowTitle(title); @@ -75,108 +75,15 @@ void ImgS3Uploader::init(const QString& title, const QString& label) QNetworkProxy* ImgS3Uploader::proxy() { - if (m_proxy == nullptr) { - initProxy(); - } - return m_proxy; -} - -QNetworkProxy* ImgS3Uploader::initProxy() -{ - // get s3 settings - ImgS3Settings imgS3Settings; - - // get proxy settings from "config.ini" file - QSettings* settings = imgS3Settings.settings(); - QString httpProxyHost = settings->value("HTTP_PROXY_HOST").toString(); - - if (httpProxyHost.length() > 0) { - m_proxy = new QNetworkProxy(); - if (settings->contains("HTTP_PROXY_TYPE")) { - switch (settings->value("HTTP_PROXY_TYPE").toInt()) { - case 0: - m_proxy->setType(QNetworkProxy::DefaultProxy); - break; - case 1: - m_proxy->setType(QNetworkProxy::Socks5Proxy); - break; - case 2: - m_proxy->setType(QNetworkProxy::NoProxy); - break; - case 4: - m_proxy->setType(QNetworkProxy::HttpCachingProxy); - break; - case 5: - m_proxy->setType(QNetworkProxy::FtpCachingProxy); - break; - case 3: - default: - m_proxy->setType(QNetworkProxy::HttpProxy); - break; - } - } - - m_proxy->setHostName(httpProxyHost); - int nProxyPort = 3128; - if (settings->contains("HTTP_PROXY_PORT")) { - nProxyPort = settings->value("HTTP_PROXY_PORT").toInt(); - } - m_proxy->setPort(nProxyPort); - - if (settings->contains("HTTP_PROXY_USER")) { - qDebug() << "Proxy user" - << settings->value("HTTP_PROXY_PASSWORD").toString(); - m_proxy->setUser(settings->value("HTTP_PROXY_USER").toString()); - } - if (settings->contains("HTTP_PROXY_PASSWORD")) { - qDebug() << "Proxy password is not empty"; - m_proxy->setPassword( - settings->value("HTTP_PROXY_PASSWORD").toString()); - } - } else { - // Get proxy settings from OS settings - QNetworkProxyQuery q(QUrl(m_s3Settings.credsUrl().toUtf8())); - q.setQueryType(QNetworkProxyQuery::UrlRequest); - q.setProtocolTag("http"); - - QList proxies = - QNetworkProxyFactory::systemProxyForQuery(q); - if (proxies.size() > 0 && proxies[0].type() != QNetworkProxy::NoProxy) { - m_proxy = new QNetworkProxy(); - m_proxy->setHostName(proxies[0].hostName()); - m_proxy->setPort(proxies[0].port()); - m_proxy->setType(proxies[0].type()); - m_proxy->setUser(proxies[0].user()); - m_proxy->setPassword(proxies[0].password()); - } - } -#ifdef QT_DEBUG - if (m_proxy != nullptr) { - qDebug() << "Using proxy server"; - qDebug() << "proxy host:" << m_proxy->hostName(); - qDebug() << "proxy port:" << m_proxy->port(); - qDebug() << "proxy type:" << m_proxy->type(); - qDebug() << "proxy user:" - << (m_proxy->user().length() > 0 ? m_proxy->user() - : "no user"); - qDebug() << "proxy password:" - << (m_proxy->password().length() > 0 ? "***" : "no password"); - } else { - qDebug() << "No proxy"; - } -#endif - return m_proxy; + return m_s3Settings.proxy(); } void ImgS3Uploader::clearProxy() { - if (m_proxy != nullptr) { - delete m_proxy; - m_proxy = nullptr; - } + m_s3Settings.clearProxy(); } -void ImgS3Uploader::handleReplyUpload(QNetworkReply* reply) +void ImgS3Uploader::handleReplyPostUpload(QNetworkReply* reply) { hideSpinner(); m_storageImageName.clear(); @@ -254,19 +161,52 @@ void ImgS3Uploader::handleReplyGetCreds(QNetworkReply* reply) } else { if (m_s3Settings.credsUrl().length() == 0) { setInfoLabelText( - tr("S3 Creds URL is not found in your configuration file")); + tr("Retrieving configuration file with s3 creds...")); + if (!m_s3Settings.getConfigRemote()) { + retry(); + } + hide(); + + if (!m_s3Settings.credsUrl().isEmpty()) { + setInfoLabelText(tr("Uploading Image...")); + upload(); + return; + } } else { setInfoLabelText(reply->errorString()); } + // FIXME - remove not uploaded preview } new QShortcut(Qt::Key_Escape, this, SLOT(close())); } +void ImgS3Uploader::retry() +{ + setInfoLabelText( + tr("S3 Creds URL is not found in your configuration file")); + if (QMessageBox::Retry == + QMessageBox::question(nullptr, + tr("Error"), + tr("Unable to get s3 credentials, please check " + "your VPN connection and try again"), + QMessageBox::Retry | QMessageBox::Cancel)) { + setInfoLabelText(tr("Retrieving configuration file with s3 creds...")); + if (!m_s3Settings.getConfigRemote()) { + retry(); + } + } else { + hide(); + } +} + void ImgS3Uploader::uploadToS3(QJsonDocument& response) { - // set paramets from "fields" - QHttpMultiPart* multiPart = - new QHttpMultiPart(QHttpMultiPart::FormDataType); + // set parameters from "fields" + if (nullptr != m_multiPart) { + delete m_multiPart; + m_multiPart = nullptr; + } + m_multiPart = new QHttpMultiPart(QHttpMultiPart::FormDataType); // read JSON response QJsonObject json = response.object(); @@ -282,7 +222,7 @@ void ImgS3Uploader::uploadToS3(QJsonDocument& response) part.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"" + key + "\"")); part.setBody(field.toLatin1()); - multiPart->append(part); + m_multiPart->append(part); } QHttpPart imagePart; @@ -297,7 +237,7 @@ void ImgS3Uploader::uploadToS3(QJsonDocument& response) pixmap().save(&buffer, "PNG"); imagePart.setBody(byteArray); - multiPart->append(imagePart); + m_multiPart->append(imagePart); setImageUrl(QUrl(resultUrl)); @@ -305,7 +245,7 @@ void ImgS3Uploader::uploadToS3(QJsonDocument& response) QNetworkRequest request(qUrl); // upload - m_NetworkAMUpload->post(request, multiPart); + m_networkAMUpload->post(request, m_multiPart); } void ImgS3Uploader::deleteResource(const QString& fileName, @@ -314,69 +254,64 @@ void ImgS3Uploader::deleteResource(const QString& fileName, // read network settings on each call to simplify configuration management // without restarting clearProxy(); - if (m_NetworkAMRemove != nullptr) { - delete m_NetworkAMRemove; - m_NetworkAMRemove = nullptr; + if (m_networkAMRemove != nullptr) { + delete m_networkAMRemove; + m_networkAMRemove = nullptr; } - m_NetworkAMRemove = new QNetworkAccessManager(this); - connect(m_NetworkAMRemove, + m_networkAMRemove = new QNetworkAccessManager(this); + connect(m_networkAMRemove, &QNetworkAccessManager::finished, this, &ImgS3Uploader::handleReplyDeleteResource); if (proxy() != nullptr) { - m_NetworkAMRemove->setProxy(*proxy()); + m_networkAMRemove->setProxy(*proxy()); } QNetworkRequest request; m_storageImageName = fileName; m_deleteToken = deleteToken; + request.setUrl(m_s3Settings.credsUrl().toUtf8() + fileName); request.setRawHeader("X-API-Key", m_s3Settings.xApiKey().toLatin1()); request.setRawHeader("Authorization", "Bearer " + deleteToken.toLatin1()); - m_NetworkAMRemove->deleteResource(request); + m_networkAMRemove->deleteResource(request); } void ImgS3Uploader::upload() { m_deleteToken.clear(); m_storageImageName.clear(); + show(); // read network settings on each call to simplify configuration management // without restarting init creds and upload network access managers clearProxy(); - if (m_NetworkAMGetCreds != nullptr) { - delete m_NetworkAMGetCreds; - m_NetworkAMGetCreds = nullptr; - } - m_NetworkAMGetCreds = new QNetworkAccessManager(this); - connect(m_NetworkAMGetCreds, + cleanNetworkAccessManagers(); + + m_networkAMGetCreds = new QNetworkAccessManager(this); + connect(m_networkAMGetCreds, &QNetworkAccessManager::finished, this, &ImgS3Uploader::handleReplyGetCreds); - if (m_NetworkAMUpload != nullptr) { - delete m_NetworkAMUpload; - m_NetworkAMUpload = nullptr; - } - m_NetworkAMUpload = new QNetworkAccessManager(this); - connect(m_NetworkAMUpload, + m_networkAMUpload = new QNetworkAccessManager(this); + connect(m_networkAMUpload, &QNetworkAccessManager::finished, this, - &ImgS3Uploader::handleReplyUpload); + &ImgS3Uploader::handleReplyPostUpload); if (proxy() != nullptr) { - m_NetworkAMGetCreds->setProxy(*proxy()); - m_NetworkAMUpload->setProxy(*proxy()); + m_networkAMGetCreds->setProxy(*proxy()); + m_networkAMUpload->setProxy(*proxy()); } // get creads - QUrl creds(m_s3Settings.credsUrl()); - QNetworkRequest requestCreds(creds); + QNetworkRequest requestCreds(QUrl(m_s3Settings.credsUrl())); if (m_s3Settings.xApiKey().length() > 0) { requestCreds.setRawHeader( QByteArray("X-API-Key"), QByteArray(m_s3Settings.xApiKey().toLocal8Bit())); } - m_NetworkAMGetCreds->get(requestCreds); + m_networkAMGetCreds->get(requestCreds); } void ImgS3Uploader::removeImagePreview() @@ -395,3 +330,19 @@ void ImgS3Uploader::removeImagePreview() m_storageImageName.clear(); resultStatus = true; } + +void ImgS3Uploader::cleanNetworkAccessManagers() +{ + if (nullptr != m_networkAMUpload) { + delete m_networkAMUpload; + m_networkAMUpload = nullptr; + } + if (nullptr != m_networkAMGetCreds) { + delete m_networkAMGetCreds; + m_networkAMGetCreds = nullptr; + } + if (nullptr != m_networkAMRemove) { + delete m_networkAMRemove; + m_networkAMRemove = nullptr; + } +} \ No newline at end of file diff --git a/src/tools/storage/s3/imgs3uploader.h b/src/tools/storage/s3/imgs3uploader.h index 8a9ec7aa..60581ce0 100644 --- a/src/tools/storage/s3/imgs3uploader.h +++ b/src/tools/storage/s3/imgs3uploader.h @@ -17,8 +17,6 @@ #pragma once -#define S3_API_IMG_PATH "v2/image/" - #include "../imguploader.h" #include "imgs3settings.h" #include @@ -34,6 +32,7 @@ class QPushButton; class QUrl; class NotificationWidget; class ImageLabel; +class QHttpMultiPart; class ImgS3Uploader : public ImgUploader { @@ -46,7 +45,7 @@ public: void deleteResource(const QString&, const QString&); private slots: - void handleReplyUpload(QNetworkReply* reply); + void handleReplyPostUpload(QNetworkReply* reply); void handleReplyGetCreds(QNetworkReply* reply); void handleReplyDeleteResource(QNetworkReply* reply); @@ -54,17 +53,18 @@ private: void init(const QString& title, const QString& label); void uploadToS3(QJsonDocument& response); void removeImagePreview(); + void retry(); - QNetworkProxy* initProxy(); void clearProxy(); QNetworkProxy* proxy(); + void cleanNetworkAccessManagers(); // class members private: ImgS3Settings m_s3Settings; - QNetworkProxy* m_proxy; - QNetworkAccessManager* m_NetworkAMUpload; - QNetworkAccessManager* m_NetworkAMGetCreds; - QNetworkAccessManager* m_NetworkAMRemove; + QNetworkAccessManager* m_networkAMUpload; + QNetworkAccessManager* m_networkAMGetCreds; + QNetworkAccessManager* m_networkAMRemove; + QHttpMultiPart* m_multiPart; }; diff --git a/src/tools/storage/storagemanager.cpp b/src/tools/storage/storagemanager.cpp index 1d4c22dd..42d02ab8 100644 --- a/src/tools/storage/storagemanager.cpp +++ b/src/tools/storage/storagemanager.cpp @@ -1,7 +1,6 @@ #include "storagemanager.h" #include "imguploader.h" #include "imgur/imguruploadertool.h" -#include "s3/imgs3settings.h" #include "s3/imgs3uploadertool.h" #include "src/tools/capturetool.h" #include @@ -22,8 +21,7 @@ CaptureTool* StorageManager::imgUploaderTool(const QString& imgUploaderType, const QString& StorageManager::storageUrl(const QString& imgUploaderType) { if (imgUploaderType == SCREENSHOT_STORAGE_TYPE_S3) { - ImgS3Settings s3Settings; - m_qstr = s3Settings.url(); + m_qstr = m_imgS3Settings.url(); } else if (imgUploaderType == SCREENSHOT_STORAGE_TYPE_IMGUR) { m_qstr = "https://i.imgur.com/"; } @@ -32,25 +30,15 @@ const QString& StorageManager::storageUrl(const QString& imgUploaderType) const QString& StorageManager::storageDefault() { - ImgS3Settings imgS3Settings; - if (!imgS3Settings.xApiKey().isEmpty()) { - m_qstr = SCREENSHOT_STORAGE_TYPE_S3; + if (!m_imgS3Settings.storageLocked().isEmpty()) { + m_qstr = m_imgS3Settings.storageLocked(); } else { m_qstr = SCREENSHOT_STORAGE_TYPE_IMGUR; } return m_qstr; } -bool StorageManager::storageLocked() +const QString& StorageManager::storageLocked() { - // TODO - move this to some common config file, not a storage specific - // configuration file - bool res = false; - ImgS3Settings imgS3Settings; - if (imgS3Settings.settings()->contains("STORAGE_LOCK")) { - res = imgS3Settings.settings() - ->value(QStringLiteral("STORAGE_LOCK")) - .toBool(); - } - return res; + return m_imgS3Settings.storageLocked(); } \ No newline at end of file diff --git a/src/tools/storage/storagemanager.h b/src/tools/storage/storagemanager.h index 70a482c0..9e42319c 100644 --- a/src/tools/storage/storagemanager.h +++ b/src/tools/storage/storagemanager.h @@ -1,6 +1,7 @@ #ifndef STORAGEMANAGER_H #define STORAGEMANAGER_H +#include "s3/imgs3settings.h" #include #include @@ -17,11 +18,12 @@ public: QObject* parent = nullptr); const QString& storageUrl(const QString& imgUploaderType); const QString& storageDefault(); - bool storageLocked(); + const QString& storageLocked(); private: // class members QString m_qstr; + ImgS3Settings m_imgS3Settings; }; #endif // STORAGEMANAGER_H diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp index 3a48f069..843f0cbc 100644 --- a/src/utils/confighandler.cpp +++ b/src/utils/confighandler.cpp @@ -459,11 +459,11 @@ void ConfigHandler::setCopyPathAfterSaveEnabled(const bool value) void ConfigHandler::setUploadStorage(const QString& uploadStorage) { StorageManager storageManager; - if (storageManager.storageLocked()) { - m_settings.setValue(QStringLiteral("uploadStorage"), - storageManager.storageDefault()); - } else { + if (storageManager.storageLocked().isEmpty()) { m_settings.setValue(QStringLiteral("uploadStorage"), uploadStorage); + } else { + m_settings.setValue(QStringLiteral("uploadStorage"), + storageManager.storageLocked()); } } @@ -471,8 +471,8 @@ const QString& ConfigHandler::uploadStorage() { StorageManager storageManager; // check for storage lock - if (storageManager.storageLocked()) { - setUploadStorage(storageManager.storageDefault()); + if (!storageManager.storageLocked().isEmpty()) { + setUploadStorage(storageManager.storageLocked()); } // get storage @@ -616,3 +616,28 @@ const QString& ConfigHandler::shortcut(const QString& shortcutName) m_settings.endGroup(); return m_strRes; } + +void ConfigHandler::setValue(const QString& group, + const QString& key, + const QVariant& value) +{ + if (!group.isEmpty()) { + m_settings.beginGroup(group); + } + m_settings.setValue(key, value); + if (!group.isEmpty()) { + m_settings.endGroup(); + } +} + +QVariant& ConfigHandler::value(const QString& group, const QString& key) +{ + if (!group.isEmpty()) { + m_settings.beginGroup(group); + } + m_varRes = m_settings.value(key); + if (!group.isEmpty()) { + m_settings.endGroup(); + } + return m_varRes; +} diff --git a/src/utils/confighandler.h b/src/utils/confighandler.h index b493427d..8670a893 100644 --- a/src/utils/confighandler.h +++ b/src/utils/confighandler.h @@ -20,6 +20,7 @@ #include "src/widgets/capture/capturetoolbutton.h" #include #include +#include #include class ConfigHandler @@ -103,8 +104,14 @@ public: QString configFilePath() const; + void setValue(const QString& group, + const QString& key, + const QVariant& value); + QVariant& value(const QString& group, const QString& key); + private: QString m_strRes; + QVariant m_varRes; QSettings m_settings; QVector m_shortcuts;