From ecdd3b2e45ae74141cc9703f645dd2e72b4e54ab Mon Sep 17 00:00:00 2001 From: Boyuan Yang <073plan@gmail.com> Date: Sat, 7 Jul 2018 20:23:24 +0800 Subject: [PATCH] Fix typo; Refresh translation; Update zh-CN translation (#267) * Fix typos found by codespell * redotool: Mark description string as translatable * Refresh translation; Update zh_CN translation again --- dbus/org.dharkael.Flameshot.xml | 4 +- docs/desktopEntry/package/flameshot.desktop | 1 + src/config/uicoloreditor.cpp | 2 +- src/tools/capturetool.h | 2 +- src/tools/redo/redotool.cpp | 2 +- src/widgets/capture/buttonhandler.cpp | 2 +- translations/Internationalization_ca.ts | 4 ++ translations/Internationalization_es.ts | 11 +++-- translations/Internationalization_fr.ts | 11 +++-- translations/Internationalization_ka.ts | 11 +++-- translations/Internationalization_pl.ts | 11 +++-- translations/Internationalization_ru.ts | 11 +++-- translations/Internationalization_tr.ts | 11 +++-- translations/Internationalization_zh_CN.ts | 55 +++++++++++---------- translations/Internationalization_zh_TW.ts | 11 +++-- 15 files changed, 97 insertions(+), 52 deletions(-) diff --git a/dbus/org.dharkael.Flameshot.xml b/dbus/org.dharkael.Flameshot.xml index 87b68b0a..c378ef26 100644 --- a/dbus/org.dharkael.Flameshot.xml +++ b/dbus/org.dharkael.Flameshot.xml @@ -62,7 +62,7 @@ @@ -73,7 +73,7 @@ diff --git a/docs/desktopEntry/package/flameshot.desktop b/docs/desktopEntry/package/flameshot.desktop index 340bb076..cbf52557 100644 --- a/docs/desktopEntry/package/flameshot.desktop +++ b/docs/desktopEntry/package/flameshot.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Flameshot +Name[zh_CN]=火焰截图 GenericName=Screenshot tool GenericName[zh_CN]=屏幕截图工具 GenericName[pl]=Zrzuty ekranu diff --git a/src/config/uicoloreditor.cpp b/src/config/uicoloreditor.cpp index fc5c9794..89afe1f3 100644 --- a/src/config/uicoloreditor.cpp +++ b/src/config/uicoloreditor.cpp @@ -136,7 +136,7 @@ void UIcolorEditor::initButtons() { this, &UIcolorEditor::changeLastButton); connect(m_buttonContrast, &CaptureButton::pressedButton, this, &UIcolorEditor::changeLastButton); - // clicking the labels chages the button too + // clicking the labels changes the button too connect(m_labelMain, &ClickableLabel::clicked, this, [this]{ changeLastButton(m_buttonMainColor); }); connect(m_labelContrast, &ClickableLabel::clicked, diff --git a/src/tools/capturetool.h b/src/tools/capturetool.h index 25f8f4c4..804298e6 100644 --- a/src/tools/capturetool.h +++ b/src/tools/capturetool.h @@ -111,7 +111,7 @@ public: // revert changes virtual void undo(QPixmap &pixmap) = 0; - // Called everytime the tool has to draw + // Called every time the tool has to draw // recordUndo indicates when the tool should save the information // for the undo(), if the value is false calling undo() after // that process should not modify revert the changes. diff --git a/src/tools/redo/redotool.cpp b/src/tools/redo/redotool.cpp index b645d05e..2ffd6b59 100644 --- a/src/tools/redo/redotool.cpp +++ b/src/tools/redo/redotool.cpp @@ -39,7 +39,7 @@ QString RedoTool::nameID() { } QString RedoTool::description() const { - return "Redo the next modification"; + return tr("Redo the next modification"); } CaptureTool* RedoTool::copy(QObject *parent) { diff --git a/src/widgets/capture/buttonhandler.cpp b/src/widgets/capture/buttonhandler.cpp index 4c7b38ec..71ff84d1 100644 --- a/src/widgets/capture/buttonhandler.cpp +++ b/src/widgets/capture/buttonhandler.cpp @@ -112,7 +112,7 @@ void ButtonHandler::updatePosition(const QRect &selection) { elemsAtCorners -= elemCornersTop; int elemCornersBotton = qBound(0, elemsAtCorners, maxExtra); - // Add buttons at the botton of the seletion + // Add buttons at the button of the seletion if (!m_blockedBotton) { int addCounter = buttonsPerRow + elemCornersBotton; // Don't add more than we have diff --git a/translations/Internationalization_ca.ts b/translations/Internationalization_ca.ts index d41d1f43..b3f1302c 100644 --- a/translations/Internationalization_ca.ts +++ b/translations/Internationalization_ca.ts @@ -518,6 +518,10 @@ Press Space to open the side panel. Redo + + Redo the next modification + + SaveTool diff --git a/translations/Internationalization_es.ts b/translations/Internationalization_es.ts index ac6989ce..4416c7d8 100644 --- a/translations/Internationalization_es.ts +++ b/translations/Internationalization_es.ts @@ -496,17 +496,17 @@ Usa la rueda del ratón para cambiar el grosor de la herramienta. Descripción - + <u><b>License</b></u> <u><b>Licencia</b></u> - + <u><b>Version</b></u> <u><b>Versión</b></u> - + <u><b>Shortcuts</b></u> <u><b>Atajos</b></u> @@ -639,6 +639,11 @@ Usa la rueda del ratón para cambiar el grosor de la herramienta. Redo Rehacer + + + Redo the next modification + + SaveTool diff --git a/translations/Internationalization_fr.ts b/translations/Internationalization_fr.ts index 20ddce0a..6ffdf4b0 100644 --- a/translations/Internationalization_fr.ts +++ b/translations/Internationalization_fr.ts @@ -492,17 +492,17 @@ Utiliser la molette pour changer l'épaisseur de l'outil.Description - + <u><b>License</b></u> <u><b>Licences</b></u> - + <u><b>Version</b></u> <u><b>Version</b></u> - + <u><b>Shortcuts</b></u> <u><b>Raccourci</b></u> @@ -635,6 +635,11 @@ Utiliser la molette pour changer l'épaisseur de l'outil.Redo Rétablir + + + Redo the next modification + + SaveTool diff --git a/translations/Internationalization_ka.ts b/translations/Internationalization_ka.ts index baaa4514..17fb8d3e 100644 --- a/translations/Internationalization_ka.ts +++ b/translations/Internationalization_ka.ts @@ -492,17 +492,17 @@ Use the Mouse Wheel to change the thickness of your tool. აღწერა - + <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> @@ -635,6 +635,11 @@ Use the Mouse Wheel to change the thickness of your tool. Redo + + + Redo the next modification + + SaveTool diff --git a/translations/Internationalization_pl.ts b/translations/Internationalization_pl.ts index 1b3adf84..08ee9be6 100644 --- a/translations/Internationalization_pl.ts +++ b/translations/Internationalization_pl.ts @@ -495,17 +495,17 @@ Użyj kółka myszy, aby zmienić grubość narzędzia do rysowania.Działanie - + <u><b>License</b></u> <u><b>Licencja</b></u> - + <u><b>Version</b></u> <u><b>Wersja</b></u> - + <u><b>Shortcuts</b></u> <u><b>Skróty klawiszowe</b></u> @@ -638,6 +638,11 @@ Użyj kółka myszy, aby zmienić grubość narzędzia do rysowania.Redo Cofnij + + + Redo the next modification + + SaveTool diff --git a/translations/Internationalization_ru.ts b/translations/Internationalization_ru.ts index a296edb8..93699c40 100644 --- a/translations/Internationalization_ru.ts +++ b/translations/Internationalization_ru.ts @@ -492,17 +492,17 @@ Use the Mouse Wheel to change the thickness of your tool. Описание - + <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> @@ -635,6 +635,11 @@ Use the Mouse Wheel to change the thickness of your tool. Redo + + + Redo the next modification + + SaveTool diff --git a/translations/Internationalization_tr.ts b/translations/Internationalization_tr.ts index ee0402bf..5804ad28 100644 --- a/translations/Internationalization_tr.ts +++ b/translations/Internationalization_tr.ts @@ -492,17 +492,17 @@ Araç boyutunu değiştirmek için fare tekerleğini kullanın. Tanım - + <u><b>License</b></u> <u><b>Lisans</b></u> - + <u><b>Version</b></u> <u><b>Sürüm</b></u> - + <u><b>Shortcuts</b></u> <u><b>Kısayollar</b></u> @@ -635,6 +635,11 @@ Araç boyutunu değiştirmek için fare tekerleğini kullanın. Redo Yeniden + + + Redo the next modification + + SaveTool diff --git a/translations/Internationalization_zh_CN.ts b/translations/Internationalization_zh_CN.ts index 82cfb0f3..c8c568a1 100644 --- a/translations/Internationalization_zh_CN.ts +++ b/translations/Internationalization_zh_CN.ts @@ -193,7 +193,7 @@ Press Space to open the side panel. Copies the selection into the clipboard - + 复制选择到剪贴板 Copies the selecion into the clipboard @@ -492,17 +492,17 @@ Press Space to open the side panel. 描述 - + <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> @@ -640,6 +640,11 @@ Press Space to open the side panel. Redo 重做 + + + Redo the next modification + 重做上次修改 + SaveTool @@ -693,27 +698,27 @@ Press Space to open the side panel. Century (00-99) - 世纪 (00-99) + 世纪（00-99） Year (00-99) - 年 (00-99) + 年（00-99） Year (2000) - 年 (2000) + 年（2000） Month Name (jan) - 月 (jul) + 月（1月 - 12月） Month Name (january) - 月 (juliol) + 月（一月 - 十二月） @@ -723,77 +728,77 @@ Press Space to open the side panel. Week Day (1-7) - 平常日 (1-7) + 周内的日（1-7） Week (01-53) - 周 (01-53) + 周（01-53） Day Name (mon) - 星期 (dg) + 星期（一 - 七） Day Name (monday) - 星期 (diumenge) + 星期（星期一 - 星期日） Day (01-31) - 天 (01-31) + 天（01-31） Day of Month (1-31) - 一月中的某天 (1-31) + 一月中的某天（1-31） Day (001-366) - 天 (001-366) + 天（001-366） Time (%H-%M-%S) - 时间 (%H-%M-%S) + 时间（%H-%M-%S） Time (%H-%M) - 时间 (%H-%M) + 时间（%H-%M） Hour (00-23) - 小时 (00-23) + 小时（00-23） Hour (01-12) - 小时 (01-12) + 小时（01-12） Minute (00-59) - 分钟 (00-59) + 分钟（00-59） Second (00-59) - 秒 (00-59) + 秒（00-59） Full Date (%m/%d/%y) - 日期 (%m/%d/%y) + 完整日期（%m/%d/%y） Full Date (%Y-%m-%d) - 日期 (%Y-%m-%d) + 完整日期（%Y-%m-%d） @@ -845,7 +850,7 @@ Press Space to open the side panel. UI Color Editor - UI 颜色编辑器 + 用户界面颜色编辑器 diff --git a/translations/Internationalization_zh_TW.ts b/translations/Internationalization_zh_TW.ts index a8b12c9e..2cc77452 100644 --- a/translations/Internationalization_zh_TW.ts +++ b/translations/Internationalization_zh_TW.ts @@ -487,17 +487,17 @@ Press Space to open the side panel. 描述 - + <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> @@ -635,6 +635,11 @@ Press Space to open the side panel. Redo + + + Redo the next modification + + SaveTool