From e9281a5194de4b4800018754731b2e32e8b1df4e Mon Sep 17 00:00:00 2001 From: George Bateman Date: Thu, 11 Jun 2015 16:55:28 +0100 Subject: [PATCH] Use correct localized strings in JavaEditor.java We were using toolbar.* when we meant menu.*.*. Also correct a couple of typos. --- build/shared/lib/languages/PDE.properties | 2 +- build/shared/lib/languages/PDE_de.properties | 2 +- build/shared/lib/languages/PDE_el.properties | 2 +- build/shared/lib/languages/PDE_es.properties | 2 +- build/shared/lib/languages/PDE_fr.properties | 4 ++-- build/shared/lib/languages/PDE_ja.properties | 1 - build/shared/lib/languages/PDE_ko.properties | 2 +- build/shared/lib/languages/PDE_nl.properties | 2 +- build/shared/lib/languages/PDE_pt.properties | 4 ++-- build/shared/lib/languages/PDE_tr.properties | 2 +- build/shared/lib/languages/PDE_zh.properties | 2 +- java/src/processing/mode/java/JavaEditor.java | 8 ++++---- 12 files changed, 16 insertions(+), 17 deletions(-) diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties index 533fa0b13..4e6336e9a 100644 --- a/build/shared/lib/languages/PDE.properties +++ b/build/shared/lib/languages/PDE.properties @@ -281,7 +281,7 @@ toolbar.debug = Debug toolbar.new = New toolbar.open = Open toolbar.save = Save -toolbar.export_application = Export Application +# toolbar.export_application = Export Application toolbar.add_mode = Add mode... # [Debug] [Continue] [Step] [Stop] [Toggle Breakpoints] [Variable Inspector] diff --git a/build/shared/lib/languages/PDE_de.properties b/build/shared/lib/languages/PDE_de.properties index e4c2a3e8d..7e3ce7c6e 100644 --- a/build/shared/lib/languages/PDE_de.properties +++ b/build/shared/lib/languages/PDE_de.properties @@ -249,7 +249,7 @@ toolbar.stop = Stoppen toolbar.new = Neu toolbar.open = Öffnen toolbar.save = Speichern -toolbar.export_application = Exportieren +# toolbar.export_application = Exportieren toolbar.add_mode = Modus hinzufügen ... # [Debug] [Continue] [Step] [Stop] [Toggle Breakpoints] [Variable Inspector] diff --git a/build/shared/lib/languages/PDE_el.properties b/build/shared/lib/languages/PDE_el.properties index 2c91047f0..a2fdb2c3d 100644 --- a/build/shared/lib/languages/PDE_el.properties +++ b/build/shared/lib/languages/PDE_el.properties @@ -284,7 +284,7 @@ toolbar.debug = Αποσφαλμάτωση toolbar.new = Νέο toolbar.open = Άνοιγμα toolbar.save = Αποθήκευση -toolbar.export_application = Εξαγωγή Εφαρμογής +# toolbar.export_application = Εξαγωγή Εφαρμογής toolbar.add_mode = Προσθήκη κατάστασης... # [Debug] [Continue] [Step] [Stop] [Toggle Breakpoints] [Variable Inspector] diff --git a/build/shared/lib/languages/PDE_es.properties b/build/shared/lib/languages/PDE_es.properties index a89c49136..9fa5d7239 100644 --- a/build/shared/lib/languages/PDE_es.properties +++ b/build/shared/lib/languages/PDE_es.properties @@ -265,7 +265,7 @@ toolbar.debug = Depurar toolbar.new = Nuevo toolbar.open = Abrir toolbar.save = Guardar -toolbar.export_application = Exportar Aplicación +# toolbar.export_application = Exportar Aplicación toolbar.add_mode = Añadir modo... # [Debug] [Continue] [Step] [Stop] [Toggle Breakpoints] [Variable Inspector] diff --git a/build/shared/lib/languages/PDE_fr.properties b/build/shared/lib/languages/PDE_fr.properties index 73c902696..e09a33e07 100644 --- a/build/shared/lib/languages/PDE_fr.properties +++ b/build/shared/lib/languages/PDE_fr.properties @@ -211,12 +211,12 @@ archive_sketch = Archiver le sketch sous... # [Run/Present] [Stop] [New] [Open] [Save] toolbar.run = Exécuter toolbar.present = Présenter -toolbar.stop = Stop +toolbar.stop = Arrêter # --- toolbar.new = Nouveau toolbar.open = Ouvrir toolbar.save = Enregistrer -toolbar.export_application = Exporter +# toolbar.export_application = Exporter toolbar.add_mode = Ajouter un mode... diff --git a/build/shared/lib/languages/PDE_ja.properties b/build/shared/lib/languages/PDE_ja.properties index 730eb9a16..d0435669a 100644 --- a/build/shared/lib/languages/PDE_ja.properties +++ b/build/shared/lib/languages/PDE_ja.properties @@ -206,7 +206,6 @@ toolbar.stop = Stop toolbar.new = New toolbar.open = Open toolbar.save = Save -toolbar.export_application = Export Application toolbar.add_mode = モードの追加... diff --git a/build/shared/lib/languages/PDE_ko.properties b/build/shared/lib/languages/PDE_ko.properties index 86b9b9a10..0480ca8e9 100644 --- a/build/shared/lib/languages/PDE_ko.properties +++ b/build/shared/lib/languages/PDE_ko.properties @@ -222,7 +222,7 @@ toolbar.stop = 정지 toolbar.new = 새 스케치 toolbar.open = 열기 toolbar.save = 저장 -toolbar.export_application = 어플리케이션으로 내보내기 +# toolbar.export_application = 어플리케이션으로 내보내기 toolbar.add_mode = 모드 추가... diff --git a/build/shared/lib/languages/PDE_nl.properties b/build/shared/lib/languages/PDE_nl.properties index a126e8d37..fb2634241 100644 --- a/build/shared/lib/languages/PDE_nl.properties +++ b/build/shared/lib/languages/PDE_nl.properties @@ -222,7 +222,7 @@ toolbar.stop = Stoppen toolbar.new = Nieuw toolbar.open = Openen toolbar.save = Opslaan -toolbar.export_application = Exporteren Applicatie +# toolbar.export_application = Exporteren Applicatie toolbar.add_mode = Modus toevoegen... diff --git a/build/shared/lib/languages/PDE_pt.properties b/build/shared/lib/languages/PDE_pt.properties index bab0ebd84..7842a7183 100644 --- a/build/shared/lib/languages/PDE_pt.properties +++ b/build/shared/lib/languages/PDE_pt.properties @@ -19,7 +19,7 @@ menu.file.examples = Exemplos... menu.file.close = Fechar menu.file.save = Guardar menu.file.save_as = Guardar Como... -menu.file.export_application = Exportar Applicação... +menu.file.export_application = Exportar Aplicação... menu.file.page_setup = Configurar Página menu.file.print = Imprimir... menu.file.preferences = Preferências... @@ -205,7 +205,7 @@ toolbar.stop = Parar toolbar.new = Novo toolbar.open = Abrir toolbar.save = Guardr -toolbar.export_application = Exportar Aplicação +# toolbar.export_application = Exportar Aplicação toolbar.add_mode = Adicionar modo... diff --git a/build/shared/lib/languages/PDE_tr.properties b/build/shared/lib/languages/PDE_tr.properties index 7a580c53d..c7229aed6 100644 --- a/build/shared/lib/languages/PDE_tr.properties +++ b/build/shared/lib/languages/PDE_tr.properties @@ -207,7 +207,7 @@ toolbar.stop = Durdur toolbar.new = Yeni toolbar.open = Aç toolbar.save = Kaydet -toolbar.export_application = Uygulama Aktarımı +# toolbar.export_application = Uygulama Aktarımı toolbar.add_mode = Mod ekle... diff --git a/build/shared/lib/languages/PDE_zh.properties b/build/shared/lib/languages/PDE_zh.properties index ef4e626d8..6e97ee418 100644 --- a/build/shared/lib/languages/PDE_zh.properties +++ b/build/shared/lib/languages/PDE_zh.properties @@ -225,7 +225,7 @@ toolbar.stop = 停止 toolbar.new = 新建 toolbar.open = 打开 toolbar.save = 保存 -toolbar.export_application = 导出程序 +# toolbar.export_application = 导出程序 toolbar.add_mode = 添加模式... diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java index f2b896b14..a77d7c240 100644 --- a/java/src/processing/mode/java/JavaEditor.java +++ b/java/src/processing/mode/java/JavaEditor.java @@ -272,7 +272,7 @@ public class JavaEditor extends Editor { public JMenu buildFileMenu() { //String appTitle = JavaToolbar.getTitle(JavaToolbar.EXPORT, false); - String appTitle = Language.text("toolbar.export_application"); + String appTitle = Language.text("menu.file.export_application"); JMenuItem exportApplication = Toolkit.newJMenuItemShift(appTitle, 'E'); exportApplication.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -285,21 +285,21 @@ public class JavaEditor extends Editor { public JMenu buildSketchMenu() { - JMenuItem runItem = Toolkit.newJMenuItem(Language.text("toolbar.run"), 'R'); + JMenuItem runItem = Toolkit.newJMenuItem(Language.text("menu.sketch.run"), 'R'); runItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handleRun(); } }); - JMenuItem presentItem = Toolkit.newJMenuItemShift(Language.text("toolbar.present"), 'R'); + JMenuItem presentItem = Toolkit.newJMenuItemShift(Language.text("menu.sketch.present"), 'R'); presentItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handlePresent(); } }); - JMenuItem stopItem = new JMenuItem(Language.text("toolbar.stop")); + JMenuItem stopItem = new JMenuItem(Language.text("menu.sketch.stop")); stopItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (isDebuggerEnabled()) {