From 048de02c8261576de2012c4d615322c706185e09 Mon Sep 17 00:00:00 2001 From: voidplus Date: Sun, 9 Nov 2014 12:12:48 +0100 Subject: [PATCH] added translations for export area --- app/src/processing/app/ColorChooser.java | 2 +- .../processing/app/languages/PDE.properties | 12 +++++++++ .../app/languages/PDE_de.properties | 14 +++++++++- app/src/processing/mode/java/JavaEditor.java | 26 +++++++++---------- 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/app/src/processing/app/ColorChooser.java b/app/src/processing/app/ColorChooser.java index b76925d5a..4eb7ed3f8 100644 --- a/app/src/processing/app/ColorChooser.java +++ b/app/src/processing/app/ColorChooser.java @@ -448,7 +448,7 @@ public class ColorChooser { //extends JFrame implements DocumentListener { } else { row.add(createFixedLabel("")); } - button = new JButton("Cancel"); + button = new JButton(Language.text("prompt.cancel")); button.addActionListener(new ActionListener() { @Override diff --git a/app/src/processing/app/languages/PDE.properties b/app/src/processing/app/languages/PDE.properties index 9cc469a01..49be649d6 100644 --- a/app/src/processing/app/languages/PDE.properties +++ b/app/src/processing/app/languages/PDE.properties @@ -178,6 +178,17 @@ export.options.fullscreen = Full Screen (Present mode) export.options.show_stop_button = Show a Stop button export.description.line1 = Export to Application creates double-clickable, export.description.line2 = standalone applications for the selected platforms. +export.unsaved_changes = Save changes before export? +export.notice.cancel.unsaved_changes = Export canceled, changes must first be saved. +export.notice.exporting = Exporting application... +export.notice.exporting.done = Done exporting. +export.notice.exporting.error = Error during export. +export.notice.exporting.cancel = Export to Application canceled. +export.tooltip.macosx = Mac OS X export is only available on Mac OS X +export.full_screen = Full Screen +export.embed_java = Embed Java +export.embed_java.for = Embed Java for +export.code_signing = Code Signing # Find (Frame) find = Find @@ -327,3 +338,4 @@ update_check.updates_available.contributions = There are updates available for s # Color Chooser color_chooser = Color Selector +color_chooser.select = Select diff --git a/app/src/processing/app/languages/PDE_de.properties b/app/src/processing/app/languages/PDE_de.properties index a88abc37b..cb290054f 100644 --- a/app/src/processing/app/languages/PDE_de.properties +++ b/app/src/processing/app/languages/PDE_de.properties @@ -20,7 +20,7 @@ menu.file.examples = Beispiele ... menu.file.close = Schließen menu.file.save = Speichern menu.file.save_as = Speichern unter ... -menu.file.export_application = Exportieren +menu.file.export_application = Exportieren ... menu.file.page_setup = Eine Kopie drucken menu.file.print = Drucken ... menu.file.preferences = Einstellungen ... @@ -169,6 +169,17 @@ export.options.fullscreen = Bildschirmfüllend (Present Mode) export.options.show_stop_button = Sichtbarer Stopp Button export.description.line1 = Exportierte Sketches sind ausführbare An- export.description.line2 = wendungen für die ausgewählten Plattformen. +export.unsaved_changes = Änderungen vor dem Exportieren speichern? +export.notice.cancel_unsaved_changes = Exportieren abgebrochen, weil Änderungen abgespeichert werden müssen. +export.notice.exporting = Exportiere Anwendung ... +export.notice.exporting.done = Exportieren abgeschlossen. +export.notice.exporting.error = Fehler während des Exportierens. +export.notice.exporting.cancel = Exportieren abgebrochen. +export.tooltip.macosx = Der Mac OS X Export ist nur auf Mac OS X Systemen möglich. +export.full_screen = Fullscreen +export.embed_java = Java Einbettung +export.embed_java.for = Java einbetten für +export.code_signing = Code Signing # Find (Frame) find = Suchen @@ -312,3 +323,4 @@ update_check.updates_available.contributions = Es sind neue Updates von installi # Color Chooser color_chooser = Color Selector +color_chooser.select = Auswählen diff --git a/app/src/processing/mode/java/JavaEditor.java b/app/src/processing/mode/java/JavaEditor.java index 119f42870..9b3c71edf 100644 --- a/app/src/processing/mode/java/JavaEditor.java +++ b/app/src/processing/mode/java/JavaEditor.java @@ -233,17 +233,17 @@ public class JavaEditor extends Editor { // toolbar.activate(JavaToolbar.EXPORT); if (handleExportCheckModified()) { - statusNotice("Exporting application..."); + statusNotice(Language.text("export.notice.exporting")); try { if (exportApplicationPrompt()) { Base.openFolder(sketch.getFolder()); - statusNotice("Done exporting."); + statusNotice(Language.text("export.notice.exporting.done")); } else { // error message will already be visible // or there was no error, in which case it was canceled. } } catch (Exception e) { - statusNotice("Error during export."); + statusNotice(Language.text("export.notice.exporting.error")); e.printStackTrace(); } } @@ -302,7 +302,7 @@ public class JavaEditor extends Editor { }); if (!Base.isMacOS()) { macosxButton.setEnabled(false); - macosxButton.setToolTipText("Mac OS X export is only available on Mac OS X"); + macosxButton.setToolTipText(Language.text("export.tooltip.macosx")); } final JCheckBox linuxButton = new JCheckBox("Linux"); @@ -399,7 +399,7 @@ public class JavaEditor extends Editor { //presentPanel.add(showStopButton); // presentPanel.add(Box.createHorizontalStrut(10)); // presentPanel.add(Box.createHorizontalGlue()); - presentPanel.setBorder(new TitledBorder("Full Screen")); + presentPanel.setBorder(new TitledBorder(Language.text("export.full_screen"))); // wide = Math.max(wide, platformPanel.getPreferredSize().width); presentPanel.setAlignmentX(Component.LEFT_ALIGNMENT); panel.add(presentPanel); @@ -448,7 +448,7 @@ public class JavaEditor extends Editor { warningLabel.setBorder(new EmptyBorder(3, 13 + indent, 3, 13)); final JCheckBox embedJavaButton = - new JCheckBox("Embed Java for " + platformName); + new JCheckBox(Language.text("export.embed_java.for") + " " + platformName); embedJavaButton.setSelected(embed); embedJavaButton.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { @@ -465,7 +465,7 @@ public class JavaEditor extends Editor { embedPanel.add(embedJavaButton); embedPanel.add(warningLabel); - embedPanel.setBorder(new TitledBorder("Embed Java")); + embedPanel.setBorder(new TitledBorder(Language.text("export.embed_java"))); panel.add(embedPanel); // @@ -473,7 +473,7 @@ public class JavaEditor extends Editor { if (Base.isMacOS()) { JPanel signPanel = new JPanel(); signPanel.setLayout(new BoxLayout(signPanel, BoxLayout.Y_AXIS)); - signPanel.setBorder(new TitledBorder("Code Signing")); + signPanel.setBorder(new TitledBorder(Language.text("export.code_signing"))); // gatekeeper: http://support.apple.com/kb/ht5290 // for developers: https://developer.apple.com/developer-id/ @@ -579,7 +579,7 @@ public class JavaEditor extends Editor { return jmode.handleExportApplication(sketch); } else if (value.equals(options[1]) || value.equals(Integer.valueOf(-1))) { // closed window by hitting Cancel or ESC - statusNotice("Export to Application canceled."); + statusNotice(Language.text("export.notice.exporting.cancel")); } return false; } @@ -633,7 +633,7 @@ public class JavaEditor extends Editor { addMouseListener(new MouseAdapter() { public void mouseReleased(MouseEvent e) { Color color = Preferences.getColor(prefName); - chooser = new ColorChooser(JavaEditor.this, true, color, "Select", ColorPreference.this); + chooser = new ColorChooser(JavaEditor.this, true, color, Language.text("color_chooser.select"), ColorPreference.this); chooser.show(); } }); @@ -679,8 +679,8 @@ public class JavaEditor extends Editor { if (sketch.isModified()) { Object[] options = { Language.text("prompt.ok"), Language.text("prompt.cancel") }; int result = JOptionPane.showOptionDialog(this, - "Save changes before export?", - "Save", + Language.text("export.unsaved_changes"), + Language.text("menu.file.save"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, @@ -694,7 +694,7 @@ public class JavaEditor extends Editor { // why it's not CANCEL_OPTION is beyond me (at least on the mac) // but f-- it.. let's get this shite done.. //} else if (result == JOptionPane.CANCEL_OPTION) { - statusNotice("Export canceled, changes must first be saved."); + statusNotice(Language.text("export.notice.cancel.unsaved_changes")); //toolbar.clear(); return false; }