From 228c4f15e506d8b3ff277a19b1ffcfbc839b1968 Mon Sep 17 00:00:00 2001 From: Alfredo Ramos Date: Fri, 27 Jul 2018 17:03:02 -0500 Subject: [PATCH] Use absolute locations in translation files (#288) They provide context when using Qt Liguist, as it shows the source code where it is being used. Also replaced QT (capital T) with Qt, as the latter is the correct name. --- CONTRIBUTING.md | 2 +- src/cli/commandlineparser.cpp | 2 +- src/core/controller.h | 4 +- src/widgets/infowindow.cpp | 2 +- translations/Internationalization_ca.ts | 166 +++++++++++++++++++++ translations/Internationalization_es.ts | 10 +- translations/Internationalization_fr.ts | 10 +- translations/Internationalization_ka.ts | 10 +- translations/Internationalization_pl.ts | 10 +- translations/Internationalization_ru.ts | 10 +- translations/Internationalization_tr.ts | 12 +- translations/Internationalization_zh_CN.ts | 10 +- translations/Internationalization_zh_TW.ts | 10 +- 13 files changed, 212 insertions(+), 46 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7995d8c6..8a3367f8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,7 @@ Contributions are welcome! Here's how you can help: ## Translations -Check this nice official documentation from QT docs as it explains how to translate for a project written with QT: https://doc.qt.io/qt-5/linguist-translators.html +Check this nice official documentation from Qt docs as it explains how to translate for a project written with Qt: https://doc.qt.io/qt-5/linguist-translators.html #### Status: diff --git a/src/cli/commandlineparser.cpp b/src/cli/commandlineparser.cpp index ebcc3e31..726f3847 100644 --- a/src/cli/commandlineparser.cpp +++ b/src/cli/commandlineparser.cpp @@ -312,7 +312,7 @@ QString CommandLineParser::value(const CommandOption &option) const { } void CommandLineParser::printVersion() { - out << "Flameshot " << qApp->applicationVersion() << "\nCompiled with QT " + out << "Flameshot " << qApp->applicationVersion() << "\nCompiled with Qt " << static_cast(QT_VERSION_STR) << "\n"; } diff --git a/src/core/controller.h b/src/core/controller.h index 17ee7f0a..6d80a4b2 100644 --- a/src/core/controller.h +++ b/src/core/controller.h @@ -72,8 +72,8 @@ private slots: private: Controller(); - // replace QTimer::singleShot introduced in QT 5.4 - // the actual target QT version is QT 5.3 + // replace QTimer::singleShot introduced in Qt 5.4 + // the actual target Qt version is 5.3 void doLater(int msec, QObject *receiver, lambda func); QMap m_requestMap; diff --git a/src/widgets/infowindow.cpp b/src/widgets/infowindow.cpp index 6f3ac061..6b29b2e1 100644 --- a/src/widgets/infowindow.cpp +++ b/src/widgets/infowindow.cpp @@ -115,7 +115,7 @@ void InfoWindow::initLabels() { QLabel *versionTitleLabel = new QLabel(tr("Version"), this); versionTitleLabel->setAlignment(Qt::AlignHCenter); m_layout->addWidget(versionTitleLabel); - QString versionMsg = "Flameshot " + QString(APP_VERSION) + "\nCompiled with QT " + QString versionMsg = "Flameshot " + QString(APP_VERSION) + "\nCompiled with Qt " + QT_VERSION_STR; QLabel *versionLabel = new QLabel(versionMsg, this); versionLabel->setAlignment(Qt::AlignHCenter); diff --git a/translations/Internationalization_ca.ts b/translations/Internationalization_ca.ts index a2d27a4c..81b2738a 100644 --- a/translations/Internationalization_ca.ts +++ b/translations/Internationalization_ca.ts @@ -4,10 +4,12 @@ AppLauncher + App Launcher Llançador d'aplicacions + Choose an app to open the capture Trieu una aplicació per obrir la captura @@ -15,26 +17,33 @@ AppLauncherWidget + Open With Obrir Amb + Launch in terminal Llançament a la terminal + Keep open after selection Segueix obert després de la selecció + + Error Error + Unable to launch in terminal. No es pot iniciar a la terminal. + Unable to write in No es pot escriure a @@ -42,10 +51,12 @@ ArrowTool + Arrow Fletxa + Sets the Arrow as the paint tool Estableix la fletxa com a eina de dibuix @@ -53,10 +64,12 @@ BlurTool + Blur Desenfocament + Sets the Blur as the paint tool Estableix el desenfocament com a eina de dibuix @@ -64,11 +77,13 @@ CaptureWidget + Unable to capture screen Impossible capturar la pantalla Imposible capturar la pantalla + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to show the color picker. @@ -80,10 +95,12 @@ Press Space to open the side panel. CircleTool + Circle Cercle + Sets the Circle as the paint tool Estableix el cercle com a eina de dibuix @@ -91,14 +108,17 @@ Press Space to open the side panel. ColorPickerWidget + Active color: + Press ESC to cancel + Grab Color @@ -106,18 +126,22 @@ Press Space to open the side panel. ConfigWindow + Configuration Configuració + Interface Interfície + Filename Editor Editor de noms + General General @@ -125,18 +149,22 @@ Press Space to open the side panel. Controller + &Configuration &Configuració + &Information &Informació + &Quit &Ix + &Take Screenshot @@ -144,10 +172,12 @@ Press Space to open the side panel. CopyTool + Copy Copia + Copies the selection into the clipboard @@ -155,6 +185,7 @@ Press Space to open the side panel. DBusUtils + Unable to connect via DBus Impossible connectar mitjançant DBus @@ -162,10 +193,12 @@ Press Space to open the side panel. ExitTool + Exit Ix + Leave the capture screen Ix de la pantalla de captura @@ -173,38 +206,47 @@ Press Space to open the side panel. FileNameEditor + Edit the name of your captures: Editeu el nom de les vostres captures: + Edit: Edita: + Preview: Previsualització: + Save Guarda + Saves the pattern Guarda el patró + Reset Reinicialitza + Restores the saved pattern Restaura el patró guardat + Clear Neteja + Deletes the name Elimina el patró @@ -212,70 +254,92 @@ Press Space to open the side panel. GeneneralConf + Show help message Mostra el missatge d'ajuda + Show the help message at the beginning in the capture mode. Mostra el missatge d'ajuda en iniciar el mode de captura. + + Show desktop notifications Mostra les notificacions d'escriptori + Show tray icon Mostra la icona en la barra de tasques + Show the systemtray icon Mostra la icona en la barra de tasques + + Import Importar + + + Error Error + Unable to read file. Impossible llegir el fitxer. + + Unable to write file. Impossible escriure al fitxer. + Save File Guardar Arxiu + Confirm Reset Confirmar Reset + Are you sure you want to reset the configuration? Esteu segur que voleu reiniciar la configuració? + Configuration File Fitxer de Configuració + Export Exportar + Reset Reset + Launch at startup Llançament a l'inici + Launch Flameshot @@ -283,38 +347,48 @@ Press Space to open the side panel. ImgurUploader + Upload to Imgur Puja a Imgur + Uploading Image S'està pujant la imatge + Copy URL Copia l'URL + Open URL Obri l'URL + Image to Clipboard. Imatge al porta-retalls. + + Unable to open the URL. No es pot obrir l'URL. + URL copied to clipboard. L'URL s'ha copiat al porta-retalls. + Screenshot copied to clipboard. La captura s'ha copiat al porta-retalls. + Delete image @@ -322,10 +396,12 @@ Press Space to open the side panel. ImgurUploaderTool + Image Uploader Puja la imatge + Uploads the selection to Imgur Puja la selecció a Imgur @@ -333,70 +409,87 @@ Press Space to open the side panel. InfoWindow + About Quant a + Right Click Clic dret + Mouse Wheel Roda del ratolí + Move selection 1px Mou la selecció 1 px + Resize selection 1px Redimensiona la selecció 1 px + Quit capture Ix de la captura + Copy to clipboard Copia al porta-retalls + Save selection as a file Guarda la selecció com a fitxer + Undo the last modification Desfés l'última modificació + Show color picker Mostra el selector de color + Change the tool's thickness Canvia el gruix de l'eina + Key Tecla + Description Descripció + <u><b>License</b></u> <u><b>Llicència</b></u> + <u><b>Version</b></u> <u><b>Versió</b></u> + <u><b>Shortcuts</b></u> <u><b>Dreceres</b></u> + Available shortcuts in the screen capture mode. Dreceres disponibles en el mode de captura de pantalla. @@ -404,10 +497,12 @@ Press Space to open the side panel. LineTool + Line Línia + Sets the Line as the paint tool Estableix la línia com a eina de dibuix @@ -415,10 +510,12 @@ Press Space to open the side panel. MarkerTool + Marker Marcador + Sets the Marker as the paint tool Estableix el marcador com a eina de dibuix @@ -426,10 +523,12 @@ Press Space to open the side panel. MoveTool + Move Mou + Move the selection area Mou la selecció @@ -437,10 +536,12 @@ Press Space to open the side panel. PencilTool + Pencil Llapis + Sets the Pencil as the paint tool Estableix el llapis com a eina de dibuix @@ -448,10 +549,12 @@ Press Space to open the side panel. PinTool + Pin Tool + Pin image on the desktop @@ -459,30 +562,42 @@ Press Space to open the side panel. QObject + Save Error S'ha produït un error en guardar + + Capture saved as Anomena i guarda la captura + + Error trying to save as S'ha produït un error en anomenar i guardar + + + + Unable to connect via DBus No es pot connectar mitjançant DBus + Error Error + Unable to write in No es pot escriure a + Capture saved to clipboard @@ -490,10 +605,12 @@ Press Space to open the side panel. RectangleTool + Rectangle Rectangle + Sets the Rectangle as the paint tool Estableix el rectangle com a eina de dibuix @@ -501,10 +618,12 @@ Press Space to open the side panel. RedoTool + Redo + Redo the next modification @@ -512,10 +631,12 @@ Press Space to open the side panel. SaveTool + Save Guarda + Save the capture Guarda la captura @@ -523,6 +644,7 @@ Press Space to open the side panel. ScreenGrabber + Unable to capture screen Imposible capturar la pantalla @@ -530,10 +652,12 @@ Press Space to open the side panel. SelectionTool + Rectangular Selection Selecció rectangular + Sets the Selection as the paint tool Estableix la selecció com a eina de dibuix @@ -541,10 +665,12 @@ Press Space to open the side panel. SizeIndicatorTool + Selection Size Indicator Indicador de mida de selecció + Shows the dimensions of the selection (X Y) Mostra les mides de la selecció (X Y) @@ -552,86 +678,107 @@ Press Space to open the side panel. StrftimeChooserWidget + Century (00-99) Segle (00-99) + Year (00-99) Any (00-99) + Year (2000) 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) @@ -639,6 +786,7 @@ Press Space to open the side panel. SystemNotification + Flameshot Info @@ -646,18 +794,22 @@ Press Space to open the side panel. TextConfig + StrikeOut + Underline + Bold + Italic @@ -665,10 +817,12 @@ Press Space to open the side panel. TextTool + Text + Add text to your capture @@ -676,30 +830,37 @@ Press Space to open the side panel. UIcolorEditor + UI Color Editor Editor de color de la interfície + Change the color moving the selectors and see the changes in the preview buttons. Canvieu el color movent els selectors i observeu els canvis en els botons de previsualització. + Select a Button to modify it Seleccioneu un botó per a modificar-lo + Main Color Color principal + Click on this button to set the edition mode of the main color. Feu clic en aquest botó per a aplicar el mode d'edició per al color principal. + Contrast Color Color de contrast + Click on this button to set the edition mode of the contrast color. Feu clic en aquest botó per a aplicar el mode d'edició per al color de contrast. @@ -707,10 +868,12 @@ Press Space to open the side panel. UndoTool + Undo Desfés + Undo the last modification Desfés l'última modificació @@ -718,14 +881,17 @@ Press Space to open the side panel. VisualsEditor + Opacity of area outside selection: Opacitat de la zona fora de la selecció: + Button Selection Selecció de botó + Select All Selecciona-ho tot diff --git a/translations/Internationalization_es.ts b/translations/Internationalization_es.ts index 19f8ba78..06ddf62e 100644 --- a/translations/Internationalization_es.ts +++ b/translations/Internationalization_es.ts @@ -565,13 +565,13 @@ Presiona Espacion para abrir el panel lateral. QObject - + Save Error Error al Guardar - - + + Capture saved as Captura guardada como @@ -581,8 +581,8 @@ Presiona Espacion para abrir el panel lateral. Captura guardada en el portapapeles - - + + Error trying to save as Error intentando guardar como diff --git a/translations/Internationalization_fr.ts b/translations/Internationalization_fr.ts index 6192efe9..7edac782 100644 --- a/translations/Internationalization_fr.ts +++ b/translations/Internationalization_fr.ts @@ -561,13 +561,13 @@ Press Space to open the side panel. QObject - + Save Error Erreur lors de la sauvegarde - - + + Capture saved as Capture d'écran sauvegardée sous @@ -577,8 +577,8 @@ Press Space to open the side panel. Capture d'écran copiée dans le Presse-papier - - + + Error trying to save as Erreur lors de la sauvegarde sous diff --git a/translations/Internationalization_ka.ts b/translations/Internationalization_ka.ts index fb94c6d6..e6f4435f 100644 --- a/translations/Internationalization_ka.ts +++ b/translations/Internationalization_ka.ts @@ -561,13 +561,13 @@ Press Space to open the side panel. QObject - + Save Error შეცდომა შენახვისას - - + + Capture saved as სურათი შენახულია როგორც: @@ -577,8 +577,8 @@ Press Space to open the side panel. - - + + Error trying to save as შეცდომა მცდელობისას შენახულიყო როგორც: diff --git a/translations/Internationalization_pl.ts b/translations/Internationalization_pl.ts index 2d07f6c5..56e027d1 100644 --- a/translations/Internationalization_pl.ts +++ b/translations/Internationalization_pl.ts @@ -564,13 +564,13 @@ Spacja, aby pokazać panel boczny. QObject - + Save Error Błąd zapisu - - + + Capture saved as Zaznaczenie zapisano jako @@ -580,8 +580,8 @@ Spacja, aby pokazać panel boczny. Zrzut skopiowano do schowka - - + + Error trying to save as Błąd przy próbie zapisu jako diff --git a/translations/Internationalization_ru.ts b/translations/Internationalization_ru.ts index 479952a6..7a21b389 100644 --- a/translations/Internationalization_ru.ts +++ b/translations/Internationalization_ru.ts @@ -561,13 +561,13 @@ Press Space to open the side panel. QObject - + Save Error Ошибка сохранения - - + + Capture saved as Сохранить снимок как @@ -577,8 +577,8 @@ Press Space to open the side panel. - - + + Error trying to save as Ошибка при попытке сохранить как diff --git a/translations/Internationalization_tr.ts b/translations/Internationalization_tr.ts index 4239981c..a676c66e 100644 --- a/translations/Internationalization_tr.ts +++ b/translations/Internationalization_tr.ts @@ -118,7 +118,7 @@ Yan paneli açmak için Boşluk tuşuna basın. Press ESC to cancel - Çıkmak için ESC'ye tıklayın + Çıkmak için ESC'ye tıklayın @@ -565,13 +565,13 @@ Yan paneli açmak için Boşluk tuşuna basın. QObject - + Save Error Kaydetme Hatası - - + + Capture saved as Yakalama farklı kaydedildi @@ -581,8 +581,8 @@ Yan paneli açmak için Boşluk tuşuna basın. Yakalama panoya kaydedildi - - + + Error trying to save as Farklı kaydetmeye çalışılırken hata oluştu diff --git a/translations/Internationalization_zh_CN.ts b/translations/Internationalization_zh_CN.ts index 4c3e98d9..a822dfb1 100644 --- a/translations/Internationalization_zh_CN.ts +++ b/translations/Internationalization_zh_CN.ts @@ -566,13 +566,13 @@ Press Space to open the side panel. QObject - + Save Error 保存错误 - - + + Capture saved as 捕获已保存为 @@ -582,8 +582,8 @@ Press Space to open the side panel. 捕获已保存至剪贴板 - - + + Error trying to save as 尝试另存为时出错 diff --git a/translations/Internationalization_zh_TW.ts b/translations/Internationalization_zh_TW.ts index a5470cad..e7d997e8 100644 --- a/translations/Internationalization_zh_TW.ts +++ b/translations/Internationalization_zh_TW.ts @@ -561,13 +561,13 @@ Press Space to open the side panel. QObject - + Save Error 存檔錯誤 - - + + Capture saved as 截圖已另存為 @@ -577,8 +577,8 @@ Press Space to open the side panel. - - + + Error trying to save as 嘗試另存新檔時發生錯誤