Browse Source

Split `MenuBar.edit.undo/redo` translation strings into `undo/redo` and `undoAction/redoAction`.

tags/v2.6.1
Andrew Belt 1 month ago
parent
commit
2b16ce803d
8 changed files with 34 additions and 18 deletions
  1. +6
    -4
      src/app/MenuBar.cpp
  2. +4
    -2
      translations/de.json
  3. +4
    -2
      translations/en.json
  4. +4
    -2
      translations/es.json
  5. +4
    -2
      translations/fr.json
  6. +4
    -2
      translations/it.json
  7. +4
    -2
      translations/ja.json
  8. +4
    -2
      translations/zh.json

+ 6
- 4
src/app/MenuBar.cpp View File

@@ -139,8 +139,9 @@ struct EditButton : MenuButton {


struct UndoItem : ui::MenuItem { struct UndoItem : ui::MenuItem {
void step() override { void step() override {
text = string::f(string::translate("MenuBar.edit.undo"), APP->history->getUndoName());
disabled = !APP->history->canUndo();
bool canUndo = APP->history->canUndo();
text = canUndo ? string::f(string::translate("MenuBar.edit.undoAction"), APP->history->getUndoName()) : string::translate("MenuBar.edit.undo");
disabled = !canUndo;
MenuItem::step(); MenuItem::step();
} }
void onAction(const ActionEvent& e) override { void onAction(const ActionEvent& e) override {
@@ -151,8 +152,9 @@ struct EditButton : MenuButton {


struct RedoItem : ui::MenuItem { struct RedoItem : ui::MenuItem {
void step() override { void step() override {
text = string::f(string::translate("MenuBar.edit.redo"), APP->history->getRedoName());
disabled = !APP->history->canRedo();
bool canRedo = APP->history->canRedo();
text = canRedo ? string::f(string::translate("MenuBar.edit.redoAction"), APP->history->getRedoName()) : string::translate("MenuBar.edit.redo");
disabled = !canRedo;
MenuItem::step(); MenuItem::step();
} }
void onAction(const ActionEvent& e) override { void onAction(const ActionEvent& e) override {


+ 4
- 2
translations/de.json View File

@@ -95,8 +95,10 @@
"MenuBar.file.importSelection": "Auswahl importieren", "MenuBar.file.importSelection": "Auswahl importieren",
"MenuBar.file.quit": "Beenden", "MenuBar.file.quit": "Beenden",
"MenuBar.edit": "Bearbeiten", "MenuBar.edit": "Bearbeiten",
"MenuBar.edit.undo": "%s rückgängig",
"MenuBar.edit.redo": "%s wiederholen",
"MenuBar.edit.undo": "Rückgängig",
"MenuBar.edit.undoAction": "%s rückgängig",
"MenuBar.edit.redo": "Wiederholen",
"MenuBar.edit.redoAction": "%s wiederholen",
"MenuBar.edit.clearCables": "Kabel entfernen", "MenuBar.edit.clearCables": "Kabel entfernen",
"MenuBar.view": "Ansicht", "MenuBar.view": "Ansicht",
"MenuBar.view.zoom": "Zoom", "MenuBar.view.zoom": "Zoom",


+ 4
- 2
translations/en.json View File

@@ -95,8 +95,10 @@
"MenuBar.file.importSelection": "Import selection", "MenuBar.file.importSelection": "Import selection",
"MenuBar.file.quit": "Quit", "MenuBar.file.quit": "Quit",
"MenuBar.edit": "Edit", "MenuBar.edit": "Edit",
"MenuBar.edit.undo": "Undo %s",
"MenuBar.edit.redo": "Redo %s",
"MenuBar.edit.undo": "Undo",
"MenuBar.edit.undoAction": "Undo %s",
"MenuBar.edit.redo": "Redo",
"MenuBar.edit.redoAction": "Redo %s",
"MenuBar.edit.clearCables": "Clear cables", "MenuBar.edit.clearCables": "Clear cables",
"MenuBar.view": "View", "MenuBar.view": "View",
"MenuBar.view.zoom": "Zoom", "MenuBar.view.zoom": "Zoom",


+ 4
- 2
translations/es.json View File

@@ -95,8 +95,10 @@
"MenuBar.file.importSelection": "Importar selección", "MenuBar.file.importSelection": "Importar selección",
"MenuBar.file.quit": "Salir", "MenuBar.file.quit": "Salir",
"MenuBar.edit": "Editar", "MenuBar.edit": "Editar",
"MenuBar.edit.undo": "Deshacer %s",
"MenuBar.edit.redo": "Rehacer %s",
"MenuBar.edit.undo": "Deshacer",
"MenuBar.edit.undoAction": "Deshacer %s",
"MenuBar.edit.redo": "Rehacer",
"MenuBar.edit.redoAction": "Rehacer %s",
"MenuBar.edit.clearCables": "Quitar cables", "MenuBar.edit.clearCables": "Quitar cables",
"MenuBar.view": "Ver", "MenuBar.view": "Ver",
"MenuBar.view.zoom": "Zoom", "MenuBar.view.zoom": "Zoom",


+ 4
- 2
translations/fr.json View File

@@ -95,8 +95,10 @@
"MenuBar.file.importSelection": "Importer la sélection", "MenuBar.file.importSelection": "Importer la sélection",
"MenuBar.file.quit": "Quitter", "MenuBar.file.quit": "Quitter",
"MenuBar.edit": "Édition", "MenuBar.edit": "Édition",
"MenuBar.edit.undo": "Annuler %s",
"MenuBar.edit.redo": "Rétablir %s",
"MenuBar.edit.undo": "Annuler",
"MenuBar.edit.undoAction": "Annuler %s",
"MenuBar.edit.redo": "Rétablir",
"MenuBar.edit.redoAction": "Rétablir %s",
"MenuBar.edit.clearCables": "Déconnecter tous les câbles", "MenuBar.edit.clearCables": "Déconnecter tous les câbles",
"MenuBar.view": "Affichage", "MenuBar.view": "Affichage",
"MenuBar.view.zoom": "Zoom", "MenuBar.view.zoom": "Zoom",


+ 4
- 2
translations/it.json View File

@@ -95,8 +95,10 @@
"MenuBar.file.importSelection": "Importa selezione", "MenuBar.file.importSelection": "Importa selezione",
"MenuBar.file.quit": "Esci", "MenuBar.file.quit": "Esci",
"MenuBar.edit": "Modifica", "MenuBar.edit": "Modifica",
"MenuBar.edit.undo": "Annulla %s",
"MenuBar.edit.redo": "Ripeti %s",
"MenuBar.edit.undo": "Annulla",
"MenuBar.edit.undoAction": "Annulla %s",
"MenuBar.edit.redo": "Ripeti",
"MenuBar.edit.redoAction": "Ripeti %s",
"MenuBar.edit.clearCables": "Rimuovi tutti i cavi", "MenuBar.edit.clearCables": "Rimuovi tutti i cavi",
"MenuBar.view": "Visualizza", "MenuBar.view": "Visualizza",
"MenuBar.view.zoom": "Zoom", "MenuBar.view.zoom": "Zoom",


+ 4
- 2
translations/ja.json View File

@@ -95,8 +95,10 @@
"MenuBar.file.importSelection": "選択部分をインポート", "MenuBar.file.importSelection": "選択部分をインポート",
"MenuBar.file.quit": "終了", "MenuBar.file.quit": "終了",
"MenuBar.edit": "編集", "MenuBar.edit": "編集",
"MenuBar.edit.undo": "%s を元に戻す",
"MenuBar.edit.redo": "%s をやり直す",
"MenuBar.edit.undo": "元に戻す",
"MenuBar.edit.undoAction": "%sを元に戻す",
"MenuBar.edit.redo": "やり直す",
"MenuBar.edit.redoAction": "%sをやり直す",
"MenuBar.edit.clearCables": "ケーブルを消去", "MenuBar.edit.clearCables": "ケーブルを消去",
"MenuBar.view": "表示", "MenuBar.view": "表示",
"MenuBar.view.zoom": "ズーム", "MenuBar.view.zoom": "ズーム",


+ 4
- 2
translations/zh.json View File

@@ -95,8 +95,10 @@
"MenuBar.file.importSelection": "导入所选文件", "MenuBar.file.importSelection": "导入所选文件",
"MenuBar.file.quit": "退出", "MenuBar.file.quit": "退出",
"MenuBar.edit": "编辑", "MenuBar.edit": "编辑",
"MenuBar.edit.undo": "撤销%s",
"MenuBar.edit.redo": "重做%s",
"MenuBar.edit.undo": "撤销",
"MenuBar.edit.undoAction": "撤销%s",
"MenuBar.edit.redo": "重做",
"MenuBar.edit.redoAction": "重做%s",
"MenuBar.edit.clearCables": "清理跳线", "MenuBar.edit.clearCables": "清理跳线",
"MenuBar.view": "视图", "MenuBar.view": "视图",
"MenuBar.view.zoom": "缩放界面", "MenuBar.view.zoom": "缩放界面",


Loading…
Cancel
Save