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/Editor.java b/app/src/processing/app/Editor.java index 3a7afd4d1..83ee34b03 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -1358,8 +1358,14 @@ public abstract class Editor extends JFrame implements RunnerListener { if (undo.canUndo() || compoundEdit != null && compoundEdit.isInProgress()) { this.setEnabled(true); undoItem.setEnabled(true); - undoItem.setText(undo.getUndoPresentationName()); - putValue(Action.NAME, undo.getUndoPresentationName()); + String newUndoPresentationName = Language.text("menu.edit.undo"); + if (undo.getUndoPresentationName().equals("Undo addition")) { + newUndoPresentationName += " "+Language.text("menu.edit.action.addition"); + } else if (undo.getUndoPresentationName().equals("Undo deletion")) { + newUndoPresentationName += " "+Language.text("menu.edit.action.deletion"); + } + undoItem.setText(newUndoPresentationName); + putValue(Action.NAME, newUndoPresentationName); // if (sketch != null) { // sketch.setModified(true); // 0107, removed for 0196 // } @@ -1407,8 +1413,14 @@ public abstract class Editor extends JFrame implements RunnerListener { protected void updateRedoState() { if (undo.canRedo()) { redoItem.setEnabled(true); - redoItem.setText(undo.getRedoPresentationName()); - putValue(Action.NAME, undo.getRedoPresentationName()); + String newRedoPresentationName = Language.text("menu.edit.redo"); + if (undo.getRedoPresentationName().equals("Redo addition")) { + newRedoPresentationName += " "+Language.text("menu.edit.action.addition"); + } else if (undo.getRedoPresentationName().equals("Redo deletion")) { + newRedoPresentationName += " "+Language.text("menu.edit.action.deletion"); + } + redoItem.setText(newRedoPresentationName); + putValue(Action.NAME, newRedoPresentationName); } else { this.setEnabled(false); redoItem.setEnabled(false); diff --git a/app/src/processing/app/Language.java b/app/src/processing/app/Language.java index 7d2a561ec..72af6723f 100644 --- a/app/src/processing/app/Language.java +++ b/app/src/processing/app/Language.java @@ -76,6 +76,8 @@ public class Language { languages.put(code, Locale.forLanguageTag(code).getDisplayLanguage(Locale.forLanguageTag(code))); } + boolean copiedLangFiles = false; + if(loadProps()){ boolean updateProps = false; @@ -92,7 +94,7 @@ public class Language { // Copy new language properties if(updateLangFiles){ - if(updateLangFiles()){ + if(copiedLangFiles = updateLangFiles()){ props.setProperty("version", version); updateProps = true; } @@ -113,6 +115,15 @@ public class Language { if(updateProps){ updateProps(); } + + } else { + // Fallback: No access to the property file + copiedLangFiles = updateLangFiles(); + } + + // Developing + if (Base.DEBUG && copiedLangFiles == false) { + updateLangFiles(); } try { @@ -172,9 +183,8 @@ public class Language { "nl", // Dutch, Nederlands "pt", // Portuguese "tr", // Turkish - "zh" // chinese + "zh" // Chinese }; - Arrays.sort(SUPPORTED); return SUPPORTED; @@ -267,7 +277,7 @@ public class Language { /** Singleton constructor */ static public Language init() { if (instance == null) { - synchronized(Language.class) { + synchronized (Language.class) { if (instance == null) { instance = new Language(); } diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java index 7006b329a..b7bc58cfd 100644 --- a/app/src/processing/app/Sketch.java +++ b/app/src/processing/app/Sketch.java @@ -281,10 +281,8 @@ public class Sketch { // if read-only, give an error if (isReadOnly()) { // if the files are read-only, need to first do a "save as". - Base.showMessage("Sketch is Read-Only", - "Some files are marked \"read-only\", so you'll\n" + - "need to re-save the sketch in another location,\n" + - "and try again."); + Base.showMessage(Language.text("new.messages.is_read_only"), + Language.text("new.messages.is_read_only.description")); return; } @@ -302,24 +300,22 @@ public class Sketch { ensureExistence(); if (currentIndex == 0 && isUntitled()) { - Base.showMessage("Sketch is Untitled", - "How about saving the sketch first \n" + - "before trying to rename it?"); + Base.showMessage(Language.text("rename.messages.is_untitled"), + Language.text("rename.messages.is_untitled.description")); return; } if (isModified()) { - Base.showMessage("Save", "Please save the sketch before renaming."); + Base.showMessage(Language.text("menu.file.save"), + Language.text("rename.messages.is_modified")); return; } // if read-only, give an error if (isReadOnly()) { // if the files are read-only, need to first do a "save as". - Base.showMessage("Sketch is Read-Only", - "Some files are marked \"read-only\", so you'll\n" + - "need to re-save the sketch in another location,\n" + - "and try again."); + Base.showMessage(Language.text("rename.messages.is_read_only"), + Language.text("rename.messages.is_read_only.description")); return; } @@ -619,17 +615,15 @@ public class Sketch { // if read-only, give an error if (isReadOnly()) { // if the files are read-only, need to first do a "save as". - Base.showMessage("Sketch is Read-Only", - "Some files are marked \"read-only\", so you'll\n" + - "need to re-save the sketch in another location,\n" + - "and try again."); + Base.showMessage(Language.text("delete.messages.is_read_only"), + Language.text("delete.messages.is_read_only.description")); return; } // don't allow if untitled if (currentIndex == 0 && isUntitled()) { - Base.showMessage("Cannot Delete", - "You can't delete a sketch that has not been saved."); + Base.showMessage(Language.text("delete.messages.cannot_delete"), + Language.text("delete.messages.cannot_delete.description")); return; } @@ -665,8 +659,8 @@ public class Sketch { } else { // delete the file if (!current.deleteFile()) { - Base.showMessage("Couldn't do it", - "Could not delete \"" + + Base.showMessage(Language.text("delete.messages.cannot_delete.file"), + Language.text("delete.messages.cannot_delete.file.description")+" \"" + current.getFileName() + "\"."); return; } diff --git a/app/src/processing/app/contrib/AvailableContribution.java b/app/src/processing/app/contrib/AvailableContribution.java index 04483740b..da4d0672a 100644 --- a/app/src/processing/app/contrib/AvailableContribution.java +++ b/app/src/processing/app/contrib/AvailableContribution.java @@ -1,4 +1,4 @@ -/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */ +/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */ /* Part of the Processing project - http://processing.org diff --git a/app/src/processing/app/contrib/LocalContribution.java b/app/src/processing/app/contrib/LocalContribution.java index 4d57faa04..bb6faf1ea 100644 --- a/app/src/processing/app/contrib/LocalContribution.java +++ b/app/src/processing/app/contrib/LocalContribution.java @@ -1,4 +1,4 @@ -/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */ +/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */ /* Part of the Processing project - http://processing.org 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; } diff --git a/build/build.xml b/build/build.xml index 8c776d0a1..ca4ebccd2 100755 --- a/build/build.xml +++ b/build/build.xml @@ -926,6 +926,8 @@ remove the spaces for depth since it should be double dash, but screws up commen + + @@ -944,10 +946,12 @@ remove the spaces for depth since it should be double dash, but screws up commen - + + + diff --git a/build/javadoc/everything/package-list b/build/javadoc/everything/package-list index cd4505a9e..dda6d9d41 100644 --- a/build/javadoc/everything/package-list +++ b/build/javadoc/everything/package-list @@ -1,5 +1,4 @@ antlr -japplemenubar processing.app processing.app.contrib processing.app.exec diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties index 178f4bc3e..95984604f 100644 --- a/build/shared/lib/languages/PDE.properties +++ b/build/shared/lib/languages/PDE.properties @@ -2,13 +2,13 @@ # --------------------------------------- # Language: English (en) (default) -# --------------------------------------- +# --------------------------------------- # --------------------------------------- # Menu -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | File | menu.file = File menu.file.new = New @@ -26,11 +26,13 @@ menu.file.print = Print... menu.file.preferences = Preferences... menu.file.quit = Quit -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Edit | menu.edit = Edit menu.edit.undo = Undo menu.edit.redo = Redo +menu.edit.action.addition = addition +menu.edit.action.deletion = deletion menu.edit.cut = Cut menu.edit.copy = Copy menu.edit.copy_as_html = Copy as HTML @@ -45,21 +47,49 @@ menu.edit.find_next = Find Next menu.edit.find_previous = Find Previous menu.edit.use_selection_for_find = Use Selection for Find -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Sketch | -menu.sketch = Sketch -menu.sketch.show_sketch_folder = Show Sketch Folder -menu.sketch.add_file = Add File... - -# | File | Edit | Sketch | Library | Tools | Help | -# | Library | +menu.sketch.run = Run +menu.sketch.present = Present +menu.sketch.tweak = Tweak +menu.sketch.stop = Stop +# --- menu.library = Import Library... menu.library.add_library = Add Library... menu.library.contributed = Contributed menu.library.no_core_libraries = mode has no core libraries +# --- +menu.sketch = Sketch +menu.sketch.show_sketch_folder = Show Sketch Folder +menu.sketch.add_file = Add File... -# | File | Edit | Sketch | Library | Tools | Help | -# | Tools | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Debug | +menu.debug = Debug +menu.debug.show_debug_toolbar = Show Debug Toolbar +menu.debug.debug = Debug +menu.debug.continue = Continue +menu.debug.stop = Stop +# --- +menu.debug.toggle_breakpoint = Toggle Breakpoint +menu.debug.list_breakpoints = List breakpoints +# --- +menu.debug.step = Step +menu.debug.step_into = Step Into +menu.debug.step_out = Step Out +# --- +menu.debug.print_stack_trace = Print Stack Trace +menu.debug.print_locals = Print Locals +menu.debug.print_fields = Print Fields +menu.debug.print_source_location = Print Source Location +menu.debug.print_threads = Print Threads +# --- +menu.debug.toggle_variable_inspector = Toggle Variable Inspector +menu.debug.show_sketch_outline = Show Sketch Outline +menu.debug.show_tabs_list = Show Tabs List + +# | File | Edit | Sketch | Debug | Tools | Help | +# | Tools | menu.tools = Tools menu.tools.color_selector = Color Selector... menu.tools.create_font = Create Font... @@ -68,8 +98,8 @@ menu.tools.fix_the_serial_lbrary = Fix the Serial Library menu.tools.install_processing_java = Install "processing-java" menu.tools.add_tool = Add Tool... -# | File | Edit | Sketch | Library | Tools | Help | -# | Help | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Help | menu.help = Help menu.help.about = About Processing menu.help.environment = Environment @@ -108,7 +138,7 @@ open = Open a Processing sketch... # Save (Frame) save = Save sketch folder as... -save.title = Do you want to save changes to this sketch
before closing? +save.title = Do you want to save changes to this sketch
before closing? save.hint = If you don't save, your changes will be lost. save.btn.save = Save save.btn.dont_save = Don't Save @@ -133,7 +163,7 @@ Select the background color used when using Present.
\ Present is used to present a sketch in full-screen,
\ accessible from the Sketch menu. preferences.use_smooth_text = Use smooth text in editor window -preferences.enable_complex_text_input = Enable complex text input +preferences.enable_complex_text_input = Enable complex text input preferences.enable_complex_text_input_example = i.e. Japanese preferences.continuously_check = Continuously check for errors preferences.show_warnings = Show warnings @@ -160,11 +190,11 @@ preferences.file.hint = edit only when Processing is not running # Sketchbook Location (Frame) sketchbook_location = Select new sketchbook location -# Sketchbook (Frame) +# Sketchbook (Frame) sketchbook = Sketchbook sketchbook.tree = Sketchbook -# examples (Frame) +# Examples (Frame) examples = Examples examples.add_examples = Add Examples... @@ -174,8 +204,19 @@ export.platforms = Platforms export.options = Options 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.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 @@ -188,7 +229,7 @@ find.btn.replace_all = Replace All find.btn.replace = Replace find.btn.find_and_replace = Find & Replace find.btn.previous = Previous -find.btn.find = Find +find.btn.find = Find # Find in reference (Frame) find_in_reference = Find in Reference @@ -207,24 +248,34 @@ archive_sketch = Archive sketch as... # --------------------------------------- -# Toolbar +# Toolbars # [Run/Present] [Stop] [New] [Open] [Save] toolbar.run = Run toolbar.present = Present toolbar.stop = Stop +# --- toolbar.new = New toolbar.open = Open toolbar.save = Save toolbar.export_application = Export Application toolbar.add_mode = Add mode... +# [Debug] [Continue] [Step] [Stop] [Toggle Breakpoints] [Variable Inspector] +toolbar.debug.debug = Debug +toolbar.debug.continue = Continue +toolbar.debug.step = Step +toolbar.debug.step_into = Step Into +toolbar.debug.stop = Stop +toolbar.debug.toggle_breakpoints = Toggle Breakpoints +toolbar.debug.variable_inspector = Variable Inspector + # --------------------------------------- # Editor # [Tab1] [Tab2] [v] -editor.header.new_tab = New Tab +editor.header.new_tab = New Tab editor.header.rename = Rename editor.header.delete = Delete editor.header.previous_tab = Previous Tab @@ -256,6 +307,32 @@ editor.status.printing.done = Done printing. editor.status.printing.error = Error while printing. editor.status.printing.canceled = Printing canceled. +# Footer buttons +editor.footer.errors = Errors +editor.footer.errors.problem = Problem +editor.footer.errors.tab = Tab +editor.footer.errors.line = Line +editor.footer.console = Console + +# New handler +new.messages.is_read_only = Sketch is Read-Only +new.messages.is_read_only.description = Some files are marked \"read-only\", so you'll\nneed to re-save the sketch in another location,\nand try again. + +# Rename handler +rename.messages.is_untitled = Sketch is Untitled +rename.messages.is_untitled.description = How about saving the sketch first\nbefore trying to rename it? +rename.messages.is_modified = Please save the sketch before renaming. +rename.messages.is_read_only = Sketch is Read-Only +rename.messages.is_read_only.description = Some files are marked \"read-only\", so you'll\nneed to re-save the sketch in another location,\nand try again. + +# Delete handler +delete.messages.cannot_delete = Cannot Delete +delete.messages.cannot_delete.description = You can't delete a sketch that has not been saved. +delete.messages.cannot_delete.file = Couldn't do it +delete.messages.cannot_delete.file.description = Could not delete +delete.messages.is_read_only = Sketch is Read-Only +delete.messages.is_read_only.description = Some files are marked \"read-only\", so you'll\nneed to re-save the sketch in another location,\nand try again. + # --------------------------------------- # Contribution Panel @@ -315,6 +392,7 @@ warn.delete.file = Are you sure you want to delete "%s"? # --------------------------------------- # Update Check + update_check = Update update_check.updates_available.core = A new version of Processing is available,\nwould you like to visit the Processing download page? update_check.updates_available.contributions = There are updates available for some of the installed contributions,\nwould you like to open the the Contribution Manager now? @@ -322,4 +400,6 @@ update_check.updates_available.contributions = There are updates available for s # --------------------------------------- # Color Chooser + color_chooser = Color Selector +color_chooser.select = Select diff --git a/build/shared/lib/languages/PDE_de.properties b/build/shared/lib/languages/PDE_de.properties index 23d23f5b7..5ce82d5cf 100644 --- a/build/shared/lib/languages/PDE_de.properties +++ b/build/shared/lib/languages/PDE_de.properties @@ -8,28 +8,31 @@ # --------------------------------------- # Menu -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | File | menu.file = Datei menu.file.new = Neu menu.file.open = Öffnen ... -menu.file.sketchbook = Sketchbook ... menu.file.recent = Letzte Dateien öffnen +menu.file.sketchbook = Sketchbook ... +menu.file.sketchbook.empty = Leeres Sketchbook 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 ... menu.file.quit = Beenden -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Edit | menu.edit = Bearbeiten menu.edit.undo = Rückgängig menu.edit.redo = Wiederholen +menu.edit.action.addition = Hinzufügen +menu.edit.action.deletion = Löschen menu.edit.cut = Ausschneiden menu.edit.copy = Kopieren menu.edit.copy_as_html = Kopieren als HTML @@ -44,21 +47,49 @@ menu.edit.find_next = Weiter suchen menu.edit.find_previous = Vorher suchen menu.edit.use_selection_for_find = Suche in Auswahl -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Sketch | +menu.sketch.run = Starten +menu.sketch.present = Starten im Vollbild +menu.sketch.tweak = Optimieren +menu.sketch.stop = Stoppen +# --- +menu.library = Library importieren ... +menu.library.add_library = Library hinzufügen ... +menu.library.contributed = Contributed +menu.library.no_core_libraries = Mode weist keine Kern-Libraries auf +# --- menu.sketch = Sketch menu.sketch.show_sketch_folder = Zeige Sketch Verzeichnis menu.sketch.add_file = Datei hinzufügen ... -# | File | Edit | Sketch | Library | Tools | Help | -# | Library | -menu.library = Library importieren... -menu.library.add_library = Library hinzufügen... -menu.library.contributed = Contributed -menu.library.no_core_libraries = Mode weist keine Kern-Libraries auf +# | File | Edit | Sketch | Debug | Tools | Help | +# | Debug | +menu.debug = Debugger +menu.debug.show_debug_toolbar = Zeige Debug Leiste +menu.debug.debug = Debuggen +menu.debug.continue = Weiter +menu.debug.stop = Stoppen +# --- +menu.debug.toggle_breakpoint = Breakpoints umschalten +menu.debug.list_breakpoints = Breakpoints auflisten +# --- +menu.debug.step = Schritt +menu.debug.step_into = Schritt vor +menu.debug.step_out = Schritt zurück +# --- +menu.debug.print_stack_trace = Stack-Trace ausgeben +menu.debug.print_locals = Locals ausgeben +menu.debug.print_fields = Fields ausgeben +menu.debug.print_source_location = Source-Location ausgeben +menu.debug.print_threads = Threads ausgeben +# --- +menu.debug.toggle_variable_inspector = Variable-Inspector umschalten +menu.debug.show_sketch_outline = Sketch-Outline anzeigen +menu.debug.show_tabs_list = Tabs Liste anzeigen -# | File | Edit | Sketch | Library | Tools | Help | -# | Tools | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Tools | menu.tools = Tools menu.tools.color_selector = Farbauswahl ... menu.tools.create_font = Schrift erstellen ... @@ -67,8 +98,8 @@ menu.tools.fix_the_serial_lbrary = "Serial Library" beheben ... menu.tools.install_processing_java = "processing-java" installieren ... menu.tools.add_tool = Tool hinzufügen ... -# | File | Edit | Sketch | Library | Tools | Help | -# | Help | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Help | menu.help = Hilfe menu.help.about = Über Processing menu.help.environment = Entwicklungsumgebung @@ -102,7 +133,7 @@ open = Processing Sketch öffnen ... # Save (Frame) save = Sketch speichern unter ... -save.title = Änderungen speichern? +save.title = Änderungen speichern? save.hint = Wenn nicht, gehen alle Änderungen verloren. save.btn.save = Speichern save.btn.dont_save = Nicht speichern @@ -112,6 +143,7 @@ preferences = Einstellungen preferences.button.width = 110 preferences.requires_restart = nach Neustart von Processing aktiv preferences.sketchbook_location = Sketchbook Pfad +preferences.sketchbook_location.popup = Sketchbook preferences.language = Sprache preferences.editor_and_console_font = Editor und Konsolen Schriftart preferences.editor_and_console_font.tip = \ @@ -133,11 +165,17 @@ preferences.show_warnings = Zeige Warnungen preferences.code_completion = Codevervollständigung preferences.trigger_with = Trigger mit preferences.cmd_space = Leerzeichen +preferences.suggest_imports = Hinweise bei fehlerhaften Imports preferences.increase_max_memory = Maximalen Speicher erhöhen auf preferences.delete_previous_folder_on_export = Leere Verzeichnis beim Exportieren preferences.hide_toolbar_background_image = Hintergrundgrafik der Toolbar ausblenden preferences.check_for_updates_on_startup = Prüfung auf Updates bei Programmstart preferences.run_sketches_on_display = Starte Sketch auf Bildschirm +preferences.run_sketches_on_display.tip = \ +Bestimme den Bildschirm auf dem der Sketch dargestellt werden soll. +Wenn das Fenster des Sketches auf einen anderen Bildschirm geschoben
\ +wird, so wird der Sketch an selber Stelle wieder geöffnet. Dabei ist es
\ +egal, ob der Sketch im Present-Modus (Fullscreen) geöffnet wird. preferences.automatically_associate_pde_files = Öffne .pde Dateien automatisch mit Processing preferences.launch_programs_in = Anwendungen starten im preferences.launch_programs_in.mode = Modus @@ -147,14 +185,29 @@ preferences.file.hint = Processing darf während der Bearbeitung nicht laufen # Sketchbook Location (Frame) sketchbook_location = Neuen Sketchbook Pfad auswählen +# Examples (Frame) +examples = Beispiele +examples.add_examples = Beispiele hinzufügen ... + # Export (Frame) export = Export Optionen export.platforms = Plattformen export.options = Optionen 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.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 @@ -190,20 +243,30 @@ archive_sketch = Sketch archivieren unter ... # [Run/Present] [Stop] [New] [Open] [Save] toolbar.run = Starten -toolbar.present = Starten in Vollbild +toolbar.present = Starten im Vollbild toolbar.stop = Stoppen +# --- toolbar.new = Neu toolbar.open = Öffnen toolbar.save = Speichern toolbar.export_application = Exportieren toolbar.add_mode = Modus hinzufügen ... +# [Debug] [Continue] [Step] [Stop] [Toggle Breakpoints] [Variable Inspector] +toolbar.debug.debug = Debuggen +toolbar.debug.continue = Fortsetzen +toolbar.debug.step = Schritt vor +toolbar.debug.step_into = Schritt vor +toolbar.debug.stop = Stoppen +toolbar.debug.toggle_breakpoints = Breakpoints setzen/entfernen +toolbar.debug.variable_inspector = Variable-Inspector anzeigen/ausblenden + # --------------------------------------- # Editor # [Tab1] [Tab2] [v] -editor.header.new_tab = Neuer Tab +editor.header.new_tab = Neuer Tab editor.header.rename = Unbenennen editor.header.delete = Löschen editor.header.previous_tab = Nächster Tab @@ -211,7 +274,7 @@ editor.header.next_tab = Vorheriger Tab editor.header.delete.warning.title = Yeah, nein. editor.header.delete.warning.text = Du kannst nicht den letzten Tab des letzten Sketches löschen. -# Tab +# Tabs editor.tab.new = Neuer Name editor.tab.new.description = Name der neuen Datei editor.tab.rename = Neuer Name @@ -220,12 +283,88 @@ editor.tab.rename.description = Name der neuen Datei # Sketch editor.sketch.rename.description = Name des neuen Sketches +editor.status.autoformat.no_changes = Keine Änderungen für die Auto-Formatierung notwendig. +editor.status.autoformat.finished = Auto-Formatierung beendet. +editor.status.find_reference.select_word_first = Selektiere zuerst ein Wort um dieses in der Referenz zu finden. +editor.status.find_reference.not_available = "%s" ist nicht in der Referenz verfügbar. +editor.status.drag_and_drop.files_added.0 = Es sind keine Daten zum Sketch hinzugefügt worden. +editor.status.drag_and_drop.files_added.1 = Eine Datei wurde dem Sketch hinzugefügt. +editor.status.drag_and_drop.files_added.n = %d Dateien wurden dem Sketch hinzugefügt. +editor.status.saving = Speichern ... +editor.status.saving.done = Speichern beendet. +editor.status.saving.canceled = Speichern abgebrochen. +editor.status.printing = Drucken ... +editor.status.printing.done = Drucken beendet. +editor.status.printing.error = Fehler während des Druckens. +editor.status.printing.canceled = Drucken abgebrochen. + +# Footer buttons +editor.footer.errors = Fehler +editor.footer.errors.problem = Problem +editor.footer.errors.tab = Tab +editor.footer.errors.line = Zeile +editor.footer.console = Konsole + +# New handler +new.messages.is_read_only = Sketch ist Read-Only +new.messages.is_read_only.description = Einige Dateien sind als \"read-only\" markiert,\naus dem Grund musst du das Sketch an einer neuer\nStelle abspeichern, und es noch mal ausprobieren. + +# Rename handler +rename.messages.is_untitled = Unbenennen abgebrochen +rename.messages.is_untitled.description = Sketch muss zuvor abgespeichert werden\nbevor es unbenannt werden kann. +rename.messages.is_modified = Speichere Sketch vor dem Umbenennen. +rename.messages.is_read_only = Sketch ist Read-Only +rename.messages.is_read_only.description = Einige Dateien sind als \"read-only\" markiert,\naus dem Grund musst du das Sketch an einer neuer\nStelle abspeichern, und es noch mal ausprobieren. + +# Delete handler +delete.messages.cannot_delete = Löschen abgebrochen +delete.messages.cannot_delete.description = Ein Sketch muss zuvor abgespeichert werden\nbevor es gelöscht werden kann. +delete.messages.cannot_delete.file = Löschen nicht möglich +delete.messages.cannot_delete.file.description = Konnte nicht gelöscht werden. +delete.messages.is_read_only = Sketch ist Read-Only +delete.messages.is_read_only.description = Einige Dateien sind als \"read-only\" markiert,\naus dem Grund musst du das Sketch an einer neuer\nStelle abspeichern, und es noch mal ausprobieren. + # --------------------------------------- # Contribution Panel contrib.category = Kategorie: contrib.filter_your_search = Suche filtern ... +contrib.show_only_compatible.mode = Zeige nur kompatible Modes an +contrib.show_only_compatible.tool = Zeige nur kompatible Tools an +contrib.show_only_compatible.library = Zeige nur kompatible Libraries an +contrib.show_only_compatible.examples-package = Zeige nur kompatible Beispiele an +contrib.show_only_compatible.update = Zeige nur kompatible Updates an +contrib.restart = Neustart von Processing +contrib.unsaved_changes = Unsaved changes have been found +contrib.unsaved_changes.prompt = Ohne Speichern von Änderungen Processing neu starten? +contrib.messages.remove_restart = Bitte Processing neu starten um die Deinstallation zu beenden. +contrib.messages.install_restart = Bitte Processing neu starten um die Installation zu beenden. +contrib.messages.update_restart = Bitte Processing neu starten um die Aktualisierung zu beenden. +contrib.errors.list_download = Die Liste mit verfügbaren Paketen konnte nicht geladen werden. +contrib.errors.list_download.timeout = Verbindungs-Wartezeit beim Laden der Liste mit verfügbaren Paketen überschritten. +contrib.errors.download_and_install = Fehler beim Laden und Installieren von %s. +contrib.errors.description_unavailable = Keine Beschreibung verfügbar. +contrib.errors.malformed_url = Der angeforderte Link von Processing.org ist nicht verfügbar.\nDu kannst die Library über die Website manuell herunterladen\nund installieren. +contrib.errors.needs_repackage = %s muss neu erstellt werden um die Richtline %s zu erfüllen. +contrib.errors.no_contribution_found = Es wurde kein %s in der Download-Datei gefunden. +contrib.errors.overwriting_properties = Fehler beim Überschreiben der .properties Datei. +contrib.errors.install_failed = Installation fehlgeschlagen. +contrib.errors.update_on_restart_failed = Update beim Neustart von %s fehlgeschlagen. +contrib.errors.temporary_directory = Es konnte nicht im temporären Verzeichnis geschrieben werden. +contrib.errors.contrib_download.timeout = Verbindungs-Wartezeit beim Download von %s überschritten. +contrib.errors.no_internet_connection = Es besteht keine Internetverbindung. +contrib.status.downloading_list = Herunterladen der Liste mit verfügbaren Paketen ... +contrib.status.done = Beendet. +contrib.all = Alle +contrib.undo = Rückgängig +contrib.remove = Entfernen +contrib.install = Installieren +contrib.progress.installing = Installiere ... +contrib.progress.starting = Starte ... +contrib.progress.downloading = Herunterladen ... +contrib.download_error = Es trat ein Fehler beim Download auf. +contrib.unsupported_operating_system = Dein Betriebssystem wird nicht unterstützt. Rufe %s für weitere Informationen auf. # --------------------------------------- @@ -234,3 +373,18 @@ contrib.filter_your_search = Suche filtern ... warn.delete = Löschen warn.delete.sketch = Den Sketch endgültig löschen? warn.delete.file = Die Datei "%s" entgültig löschen? + + +# --------------------------------------- +# Update Check + +update_check = Update +update_check.updates_available.core = Eine neue Version von Processing ist verfügbar,\nsoll der Download-Bereich aufgerufen werden? +update_check.updates_available.contributions = Es sind neue Updates von installierten Paketen verfügbar,\nsoll der Contribution Manager geöffnet werden? + + +# --------------------------------------- +# Color Chooser + +color_chooser = Color Selector +color_chooser.select = Auswählen diff --git a/build/shared/lib/languages/PDE_el.properties b/build/shared/lib/languages/PDE_el.properties index 9e042dc0e..830bc24d4 100644 --- a/build/shared/lib/languages/PDE_el.properties +++ b/build/shared/lib/languages/PDE_el.properties @@ -2,13 +2,13 @@ # --------------------------------------- # Language: Greek (Ελληνικά) (el) -# --------------------------------------- +# --------------------------------------- # --------------------------------------- # Menu -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | File | menu.file = Αρχείο menu.file.new = Νέο @@ -25,7 +25,7 @@ menu.file.print = Εκτύπωση... menu.file.preferences = Προτιμήσεις... menu.file.quit = Έξοδος -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Edit | menu.edit = Επεξεργασία menu.edit.undo = Αναίρεση @@ -44,21 +44,28 @@ menu.edit.find_next = Αναζήτηση επόμενου menu.edit.find_previous = Αναζήτηση προηγούμενου menu.edit.use_selection_for_find = Χρήση επιλογής για Αναζήτηση -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Sketch | -menu.sketch = Σχέδιο -menu.sketch.show_sketch_folder = Προβολή φακέλου του Σχεδίου -menu.sketch.add_file = Προσθήκη αρχείου... - -# | File | Edit | Sketch | Library | Tools | Help | -# | Library | +menu.sketch.run = Εκτέλεση +menu.sketch.present = Παρουσίαση +menu.sketch.tweak = Tweak +menu.sketch.stop = Τερματισμός +# --- menu.library = Εισαγωγή Βιβλιοθήκης... menu.library.add_library = Προσθήκη Βιβλιοθήκης... menu.library.contributed = Συνεισφερόμενα menu.library.no_core_libraries = Αυτή η λειτουργία δεν έχει βασικές Βιβλιοθήκες +# --- +menu.sketch = Σχέδιο +menu.sketch.show_sketch_folder = Προβολή φακέλου του Σχεδίου +menu.sketch.add_file = Προσθήκη αρχείου... -# | File | Edit | Sketch | Library | Tools | Help | -# | Tools | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Debug | +# ... + +# | File | Edit | Sketch | Debug | Tools | Help | +# | Tools | menu.tools = Εργαλεία menu.tools.color_selector = Επιλογέας χρωμάτων... menu.tools.create_font = Δημιουργία γραμματοσειρά... @@ -67,8 +74,8 @@ menu.tools.fix_the_serial_lbrary = Διόρθωση Σειριακής Βιβλ menu.tools.install_processing_java = Εγκατάσταση της "processing-java" menu.tools.add_tool = Προσθήκη εργαλείου... -# | File | Edit | Sketch | Library | Tools | Help | -# | Help | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Help | menu.help = Βοήθεια menu.help.about = Σχετικά με την Processing menu.help.environment = Περιβάλλον @@ -123,7 +130,7 @@ preferences.editor_font_size = Μέγεθος γραμματοσειράς Επ preferences.console_font_size = Μέγεθος γραμματοσειράς Κονσόλας preferences.background_color = Χρώμα φόντου κατά την Παρουσίαση preferences.use_smooth_text = Χρήση ομαλού κειμένου στο παράθυρο επεξεργασίας -preferences.enable_complex_text_input = Ενεργοποίηση εισαγωγής σύνθετου κειμένου +preferences.enable_complex_text_input = Ενεργοποίηση εισαγωγής σύνθετου κειμένου preferences.enable_complex_text_input_example = π.χ. Ιαπωνικά preferences.continuously_check = Συνεχής έλεγχος σφαλμάτων preferences.show_warnings = Προβολή προειδοποιήσεων @@ -169,7 +176,7 @@ find.btn.replace_all = Αντικατάσταση όλων find.btn.replace = Αντικατάσταση find.btn.find_and_replace = Αναζήτηση και Αντικατάσταση find.btn.previous = Προηγούμενο -find.btn.find = Αναζήτηση +find.btn.find = Αναζήτηση # Find in reference (Frame) find_in_reference = Αναζήτηση στην Processing Reference @@ -188,12 +195,13 @@ archive_sketch = Αρχειοθέτηση Σχεδίου ως... # --------------------------------------- -# Toolbar +# Toolbars # [Run/Present] [Stop] [New] [Open] [Save] toolbar.run = Εκτέλεση toolbar.present = Παρουσίαση toolbar.stop = Τερματισμός +# --- toolbar.new = Νέο toolbar.open = Άνοιγμα toolbar.save = Αποθήκευση @@ -205,7 +213,7 @@ toolbar.add_mode = Προσθήκη κατάστασης... # Editor # [Tab1] [Tab2] [v] -editor.header.new_tab = Νέα Καρτέλα +editor.header.new_tab = Νέα Καρτέλα editor.header.rename = Μετονομασία editor.header.delete = Διαγραφή editor.header.previous_tab = Προηγούμενη Καρτέλα diff --git a/build/shared/lib/languages/PDE_es.properties b/build/shared/lib/languages/PDE_es.properties index b0167ce66..acf103827 100644 --- a/build/shared/lib/languages/PDE_es.properties +++ b/build/shared/lib/languages/PDE_es.properties @@ -8,7 +8,7 @@ # --------------------------------------- # Menu -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | File | menu.file = Archivo menu.file.new = Nuevo @@ -26,7 +26,7 @@ menu.file.print = Imprimir... menu.file.preferences = Preferencias... menu.file.quit = Salir -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Edit | menu.edit = Editar menu.edit.undo = Deshacer @@ -45,21 +45,28 @@ menu.edit.find_next = Buscar siguiente menu.edit.find_previous = Buscar anterior menu.edit.use_selection_for_find = Usar selección para buscar -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Sketch | -menu.sketch = Sketch -menu.sketch.show_sketch_folder = Mostrar carpeta de sketches -menu.sketch.add_file = Añadir archivo - -# | File | Edit | Sketch | Library | Tools | Help | -# | Library | +menu.sketch.run = Ejecutar +menu.sketch.present = Presentar +menu.sketch.tweak = Tweak +menu.sketch.stop = Detener +# --- menu.library = Importar biblioteca... menu.library.add_library = Añadir biblioteca... menu.library.contributed = Contribuidas menu.library.no_core_libraries = el modo no tiene bibliotecas incluidas +# --- +menu.sketch = Sketch +menu.sketch.show_sketch_folder = Mostrar carpeta de sketches +menu.sketch.add_file = Añadir archivo -# | File | Edit | Sketch | Library | Tools | Help | -# | Tools | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Debug | +#... + +# | File | Edit | Sketch | Debug | Tools | Help | +# | Tools | menu.tools = Herramientas menu.tools.color_selector = Selector de colores... menu.tools.create_font = Crear fuente... @@ -68,8 +75,8 @@ menu.tools.fix_the_serial_lbrary = Corregir la biblioteca de serie menu.tools.install_processing_java = Instalar "processing-java" menu.tools.add_tool = Añadir herramienta... -# | File | Edit | Sketch | Library | Tools | Help | -# | Help | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Help | menu.help = Ayuda menu.help.about = Acerca de Processing menu.help.environment = Entorno @@ -108,7 +115,7 @@ open = Abrir un sketch de Processing... # Save (Frame) save = Guardar directorio de sketches... -save.title = Deseas guardar cambios a este sketch
antes de cerrar? +save.title = Deseas guardar cambios a este sketch
antes de cerrar? save.hint = Si no los guardas, tus cambios se perderán. save.btn.save = Guardar save.btn.dont_save = No guardar @@ -125,7 +132,7 @@ preferences.editor_and_console_font.tip = \ Selecciona la fuente usada en el editor y la consola.
\ Sólo las fuentes con caracteres de ancho fijo pueden
\ ser utilizadas, aunque la lista puede ser incompleta. -preferences.editor_font_size = Tamaño de letra del editor +preferences.editor_font_size = Tamaño de letra del editor preferences.console_font_size = Tamaño de letra de la consola preferences.background_color = Color de fondo en modo presentación preferences.background_color.tip = \ @@ -135,10 +142,10 @@ pantalla completa, y es accesible desde el menú Sketch. preferences.use_smooth_text = Usar texto suavizado en la ventana del editor preferences.enable_complex_text_input = Habilitar el ingreso de caracteres complejos preferences.enable_complex_text_input_example = ej. Japonés -preferences.continuously_check = Comprobar errores de forma continua +preferences.continuously_check = Comprobar errores de forma continua preferences.show_warnings = Mostrar advertencias preferences.code_completion = Autocompletado de código -preferences.trigger_with = Activar con +preferences.trigger_with = Activar con preferences.cmd_space = espacio preferences.suggest_imports = Sugerir declaraciones de importación preferences.increase_max_memory = Aumentar memoria máxima disponible a @@ -174,7 +181,7 @@ export.platforms = Plataformas export.options = Opciones export.options.fullscreen = Pantalla completa (Modo Presentación) export.options.show_stop_button = Mostrar un botón de Detener -export.description.line1 = Exportar a Aplicación crea aplicaciones ejecutables, +export.description.line1 = Exportar a Aplicación crea aplicaciones ejecutables, export.description.line2 = independientes para las plataformas seleccionadas. # Find (Frame) @@ -207,12 +214,13 @@ archive_sketch = Archivar sketch como... # --------------------------------------- -# Toolbar +# Toolbars # [Run/Present] [Stop] [New] [Open] [Save] toolbar.run = Ejecutar toolbar.present = Presentar toolbar.stop = Detener +# --- toolbar.new = Nuevo toolbar.open = Abrir toolbar.save = Guardar diff --git a/build/shared/lib/languages/PDE_fr.properties b/build/shared/lib/languages/PDE_fr.properties index 8bd45cbcb..e0190df30 100644 --- a/build/shared/lib/languages/PDE_fr.properties +++ b/build/shared/lib/languages/PDE_fr.properties @@ -8,7 +8,7 @@ # --------------------------------------- # Menu -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | File | menu.file = Fichier menu.file.new = Nouveau @@ -25,7 +25,7 @@ menu.file.print = Imprimer... menu.file.preferences = Préférences... menu.file.quit = Quitter -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Edit | menu.edit = Modifier menu.edit.undo = Annuler @@ -44,21 +44,28 @@ menu.edit.find_next = Rechercher suivant menu.edit.find_previous = Rechercher précédent menu.edit.use_selection_for_find = Rechercher dans la sélection -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Sketch | -menu.sketch = Sketch -menu.sketch.show_sketch_folder = Afficher le dossier -menu.sketch.add_file = Ajouter un fichier... - -# | File | Edit | Sketch | Library | Tools | Help | -# | Library | +menu.sketch.run = Exécuter +menu.sketch.present = Présenter +menu.sketch.present = Tweak +menu.sketch.stop = Stop +# --- menu.library = Importer une librairie... menu.library.add_library = Ajouter une librairie... menu.library.contributed = Contribuées menu.library.no_core_libraries = Ce mode n'a pas de librairies de base +# --- +menu.sketch = Sketch +menu.sketch.show_sketch_folder = Afficher le dossier +menu.sketch.add_file = Ajouter un fichier... -# | File | Edit | Sketch | Library | Tools | Help | -# | Tools | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Debug | +# ... + +# | File | Edit | Sketch | Debug | Tools | Help | +# | Tools | menu.tools = Outils menu.tools.color_selector = Sélecteur de couleurs... menu.tools.create_font = Générer la police... @@ -67,8 +74,8 @@ menu.tools.fix_the_serial_lbrary = Réparer la "Serial Library"... menu.tools.install_processing_java = Installer "processing-java"... menu.tools.add_tool = Ajouter un outil... -# | File | Edit | Sketch | Library | Tools | Help | -# | Help | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Help | menu.help = Aide menu.help.about = À propos de Processing (en) menu.help.environment = Environement (en) @@ -123,7 +130,7 @@ preferences.enable_complex_text_input_example = ex.: Japonais preferences.continuously_check = Détecter les erreurs en continu preferences.show_warnings = Afficher les avertissements preferences.code_completion = Autocomplétion du code -preferences.trigger_with = Forcer l'autocomplétion avec +preferences.trigger_with = Forcer l'autocomplétion avec preferences.cmd_space = Espace preferences.increase_max_memory = Augmenter la mémoire vive disponible preferences.delete_previous_folder_on_export = Effacer le dossier précédent lors de l'export @@ -178,12 +185,13 @@ archive_sketch = Archiver le sketch sous... # --------------------------------------- -# Toolbar +# Toolbars # [Run/Present] [Stop] [New] [Open] [Save] toolbar.run = Exécuter toolbar.present = Présenter toolbar.stop = Stop +# --- toolbar.new = Nouveau toolbar.open = Ouvrir toolbar.save = Enregistrer diff --git a/build/shared/lib/languages/PDE_ja.properties b/build/shared/lib/languages/PDE_ja.properties index 211a682e7..730eb9a16 100644 --- a/build/shared/lib/languages/PDE_ja.properties +++ b/build/shared/lib/languages/PDE_ja.properties @@ -8,7 +8,7 @@ # --------------------------------------- # Menu -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | File | menu.file = ファイル menu.file.new = 新規 @@ -25,7 +25,7 @@ menu.file.print = プリント menu.file.preferences = 設定 menu.file.quit = 終了 -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Edit | menu.edit = 編集 menu.edit.undo = 戻す @@ -44,21 +44,28 @@ menu.edit.find_next = 次を探す menu.edit.find_previous = 前を探す menu.edit.use_selection_for_find = 選択を検索 -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Sketch | -menu.sketch = スケッチ -menu.sketch.show_sketch_folder = スケッチフォルダを開く -menu.sketch.add_file = ファイルを追加... - -# | File | Edit | Sketch | Library | Tools | Help | -# | Library | +menu.sketch.run = Run +menu.sketch.present = Present +menu.sketch.tweak = Tweak +menu.sketch.stop = Stop +# --- menu.library = ライブラリのインポート... menu.library.add_library = ライブラリの追加... menu.library.contributed = 貢献 menu.library.no_core_libraries = モードにコアライブラリがありません +# --- +menu.sketch = スケッチ +menu.sketch.show_sketch_folder = スケッチフォルダを開く +menu.sketch.add_file = ファイルを追加... -# | File | Edit | Sketch | Library | Tools | Help | -# | Tools | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Debug | +# ... + +# | File | Edit | Sketch | Debug | Tools | Help | +# | Tools | menu.tools = ツール menu.tools.create_font = フォント作成... menu.tools.color_selector = 色選択 @@ -67,8 +74,8 @@ menu.tools.fix_the_serial_lbrary = シリアルライブラリを修正 menu.tools.install_processing_java = "processing-java"をインストール menu.tools.add_tool = ツールを追加... -# | File | Edit | Sketch | Library | Tools | Help | -# | Help | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Help | menu.help = ヘルプ menu.help.about = About Processing menu.help.environment = 環境 @@ -107,7 +114,7 @@ open = Open a Processing sketch... # Save (Frame) save = Save sketch folder as... -save.title = Do you want to save changes to this sketch
before closing? +save.title = Do you want to save changes to this sketch
before closing? save.hint = If you don't save, your changes will be lost. save.btn.save = Save save.btn.dont_save = Don't Save @@ -195,6 +202,7 @@ archive_sketch = スケッチをアーカイブする... toolbar.run = Run toolbar.present = Present toolbar.stop = Stop +# --- toolbar.new = New toolbar.open = Open toolbar.save = Save diff --git a/build/shared/lib/languages/PDE_ko.properties b/build/shared/lib/languages/PDE_ko.properties index 67df2e89b..86b9b9a10 100644 --- a/build/shared/lib/languages/PDE_ko.properties +++ b/build/shared/lib/languages/PDE_ko.properties @@ -8,81 +8,88 @@ # --------------------------------------- # Menu -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | File | -menu.file = 파일 -menu.file.new = 새 스케치 +menu.file = 파일 +menu.file.new = 새 스케치 menu.file.open = 열기... menu.file.recent = 최근 스케치 menu.file.sketchbook = 스케치북 menu.file.sketchbook.empty = Empty Sketchbook menu.file.examples = 예제... -menu.file.close = 닫기 +menu.file.close = 닫기 menu.file.save = 저장 menu.file.save_as = 다른 이름으로 저장... -menu.file.export_application = 어플리케이션으로 내보내기... -menu.file.page_setup = 인쇄 설정 +menu.file.export_application = 어플리케이션으로 내보내기... +menu.file.page_setup = 인쇄 설정 menu.file.print = 인쇄 menu.file.preferences = 환경 설정 menu.file.quit = 종료 -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Edit | -menu.edit = 편집 -menu.edit.undo = 입력 취소 -menu.edit.redo = 다시 실행 -menu.edit.cut = 잘라내기 -menu.edit.copy = 복사하기 -menu.edit.copy_as_html = HTML 서식으로 복사 +menu.edit = 편집 +menu.edit.undo = 입력 취소 +menu.edit.redo = 다시 실행 +menu.edit.cut = 잘라내기 +menu.edit.copy = 복사하기 +menu.edit.copy_as_html = HTML 서식으로 복사 menu.edit.paste = 붙이기 -menu.edit.select_all = 전체선택 -menu.edit.auto_format = 자동 정렬 -menu.edit.comment_uncomment = 주석 처리/해제 -menu.edit.increase_indent = 들여쓰기 -menu.edit.decrease_indent = 내어쓰기 +menu.edit.select_all = 전체선택 +menu.edit.auto_format = 자동 정렬 +menu.edit.comment_uncomment = 주석 처리/해제 +menu.edit.increase_indent = 들여쓰기 +menu.edit.decrease_indent = 내어쓰기 menu.edit.find = 찾기... -menu.edit.find_next = 다음 찾기 -menu.edit.find_previous = 이전 찾기 +menu.edit.find_next = 다음 찾기 +menu.edit.find_previous = 이전 찾기 menu.edit.use_selection_for_find = 선택영역으로 찾기 -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Sketch | -menu.sketch = 스케치 -menu.sketch.show_sketch_folder = 스케치 폴더 열기 -menu.sketch.add_file = 스케치 불러오기... - -# | File | Edit | Sketch | Library | Tools | Help | -# | Library | +menu.sketch.run = 실행 +menu.sketch.present = 전체 화면 +menu.sketch.tweak = Tweak +menu.sketch.stop = 정지 +# --- menu.library = 내부 라이브러리... menu.library.add_library = 라이브러리 추가하기... menu.library.contributed = 외부 라이브러리 menu.library.no_core_libraries = 내부 라이브러리 미제공 +# --- +menu.sketch = 스케치 +menu.sketch.show_sketch_folder = 스케치 폴더 열기 +menu.sketch.add_file = 스케치 불러오기... -# | File | Edit | Sketch | Library | Tools | Help | -# | Tools | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Debug | +# ... + +# | File | Edit | Sketch | Debug | Tools | Help | +# | Tools | menu.tools = 도구 menu.tools.create_font = 글꼴 생성... menu.tools.color_selector = 색상 선택 menu.tools.archive_sketch = .zip으로 압축하기 menu.tools.fix_the_serial_lbrary = 시리얼 라이브러리 오류 수정 -menu.tools.install_processing_java = "processing-java" 설치 +menu.tools.install_processing_java = "processing-java" 설치 menu.tools.add_tool = 추가도구 생성... -# | File | Edit | Sketch | Library | Tools | Help | -# | Help | -menu.help = 도움말 -menu.help.about = Processing에 관하여 -menu.help.environment = 환경 +# | File | Edit | Sketch | Debug | Tools | Help | +# | Help | +menu.help = 도움말 +menu.help.about = Processing에 관하여 +menu.help.environment = 환경 menu.help.reference = 레퍼런스 menu.help.find_in_reference = 레퍼런스 찾기 menu.help.online = 온라인 -menu.help.getting_started = 시작하기 +menu.help.getting_started = 시작하기 menu.help.getting_started.url = http://processing.org/learning/gettingstarted/ -menu.help.troubleshooting = 문제해결 +menu.help.troubleshooting = 문제해결 menu.help.troubleshooting.url = http://wiki.processing.org/w/Troubleshooting menu.help.faq = f&q menu.help.faq.url = http://wiki.processing.org/w/FAQ -menu.help.foundation = 프로세싱 재단 +menu.help.foundation = 프로세싱 재단 menu.help.foundation.url = http://processing.org/foundation/ menu.help.visit = Processing.org menu.help.visit.url = http://processing.org/ @@ -94,10 +101,10 @@ menu.help.visit.url = http://processing.org/ # Buttons prompt.yes = 예 prompt.no = 아니오 -prompt.cancel = 취소 +prompt.cancel = 취소 prompt.ok = OK prompt.browse = 네비게이션 -prompt.export = 내보내기 +prompt.export = 내보내기 # --------------------------------------- @@ -111,7 +118,7 @@ save = 다른 이름으로 해당 폴더에 저장... save.title = 스케치의 변경 내용을 저장할까요? save.hint = 저장하지 않으면 변경 내용은 삭제됩니다. save.btn.save = 저장 -save.btn.dont_save = 저장 안 함 +save.btn.dont_save = 저장 안 함 # Preferences (Frame) preferences = 설정 @@ -120,76 +127,76 @@ preferences.requires_restart = 프로세싱 재실행 시 적용 preferences.sketchbook_location = 스케치 폴더 위치 preferences.sketchbook_location.popup = 스케치 폴더 위치 preferences.language = 언어 -preferences.editor_and_console_font = 스케치 에디터와 콘솔 글꼴 +preferences.editor_and_console_font = 스케치 에디터와 콘솔 글꼴 preferences.editor_and_console_font.tip = \ Select the font used in the Editor and the Console.
\ Only monospaced (fixed-width) fonts may be used,
\ though the list may be imperfect. preferences.editor_font_size = 스케치 에디터 글꼴 크기 preferences.console_font_size = 콘솔 글꼴 크기 -preferences.background_color = 전체 화면 보기 배경색상 +preferences.background_color = 전체 화면 보기 배경색상 preferences.background_color.tip = \ Select the background color used when using Present.
\ Present is used to present a sketch in full-screen,
\ accessible from the Sketch menu. -preferences.use_smooth_text = 에디터창 부드러운 글꼴 적용 -preferences.enable_complex_text_input = 다국어 언어 입력 허용 -preferences.enable_complex_text_input_example = 예. 한국어 -preferences.continuously_check = 오류 검사 활성화 -preferences.show_warnings = 오류 메시지 보기 +preferences.use_smooth_text = 에디터창 부드러운 글꼴 적용 +preferences.enable_complex_text_input = 다국어 언어 입력 허용 +preferences.enable_complex_text_input_example = 예. 한국어 +preferences.continuously_check = 오류 검사 활성화 +preferences.show_warnings = 오류 메시지 보기 preferences.code_completion = 코드 자동 완성 -preferences.trigger_with = 자동 완성 비활성화 +preferences.trigger_with = 자동 완성 비활성화 preferences.cmd_space = space키 -preferences.increase_max_memory = 프로세싱의 사용 메모리 설정 +preferences.increase_max_memory = 프로세싱의 사용 메모리 설정 preferences.delete_previous_folder_on_export = 내보내기 시 기존 폴더 삭제 -preferences.hide_toolbar_background_image = 탭/툴바의 배경 이미지 숨기기 +preferences.hide_toolbar_background_image = 탭/툴바의 배경 이미지 숨기기 preferences.check_for_updates_on_startup = 프로그램 시작 시 버전 업데이트 확인 -preferences.run_sketches_on_display = 실행 시 스케치창 디스플레이의 장치 설정 +preferences.run_sketches_on_display = 실행 시 스케치창 디스플레이의 장치 설정 preferences.run_sketches_on_display.tip = \ Sets the display where sketches are initially placed.
\ -As usual, if the sketch window is moved, it will re-open
\ 일반적으로, 스케치 창이 이동되면 +As usual, if the sketch window is moved, it will re-open
\ 일반적으로, 스케치 창이 이동되면 at the same location, however when running in present
\ (full screen) mode, this display will always be used. -preferences.automatically_associate_pde_files = .pde 파일 실행 시 프로세싱으로 자동 연결 +preferences.automatically_associate_pde_files = .pde 파일 실행 시 프로세싱으로 자동 연결 preferences.launch_programs_in = 프로그램 실행 preferences.launch_programs_in.mode = 모드 -preferences.file = 기타 자세 설정은 해당 경로의 파일에서 변경 가능 -preferences.file.hint = 프로그램 종료 시에만 적용 +preferences.file = 기타 자세 설정은 해당 경로의 파일에서 변경 가능 +preferences.file.hint = 프로그램 종료 시에만 적용 # Sketchbook Location (Frame) -sketchbook_location = 새 스케치북 폴더 위치 설정 +sketchbook_location = 새 스케치북 폴더 위치 설정 # Sketchbook (Frame) sketchbook = 스케치북 sketchbook.tree = 스케치북 # Examples (Frame) -examples = 예제 +examples = 예제 # Export (Frame) export = 내보내 옵션 -export.platforms = 플랫폼 -export.options = 옵션 +export.platforms = 플랫폼 +export.options = 옵션 export.options.fullscreen = 전체 화면 (보기 모드) -export.options.show_stop_button = 정지 버튼 표시 +export.options.show_stop_button = 정지 버튼 표시 export.description.line1 = "어플리케이션으로 내보내기"는 아래에서 선택한 플랫폼에서 -export.description.line2 = 독립적으로 실행되는 어플리케이션으로 스케치를 저장합니다. +export.description.line2 = 독립적으로 실행되는 어플리케이션으로 스케치를 저장합니다. # Find (Frame) -find = 찾기 +find = 찾기 find.find = 찾을 내용: find.replace_with = 바꿀 내용: -find.ignore_case = 대소문자 구별 안 함 -find.all_tabs = 탭 전체 -find.wrap_around = 자동 줄바꿈 -find.btn.replace_all = 모두 바꾸기 -find.btn.replace = 바꾸기 +find.ignore_case = 대소문자 구별 안 함 +find.all_tabs = 탭 전체 +find.wrap_around = 자동 줄바꿈 +find.btn.replace_all = 모두 바꾸기 +find.btn.replace = 바꾸기 find.btn.find_and_replace = 찾기 & 바꾸기 find.btn.previous = 이전 find.btn.find = 찾기 # Find in reference (Frame) -find_in_reference = 레퍼런스에서 찾기 +find_in_reference = 레퍼런스에서 찾기 # File (Frame) file = 선택한 이미지 또는 데이터 파일을 스케치로 불러오기 @@ -198,37 +205,38 @@ file = 선택한 이미지 또는 데이터 파일을 스케치로 불러오기 create_font = 글꼴 생성 # Color Selector (Frame) -color_selector = 색상 선택기 +color_selector = 색상 선택기 # Archive Sketch (Frame) archive_sketch = 스케치 전체를 (이미지/데이터 포함) Zip으로 압축하기... # --------------------------------------- -# Toolbar +# Toolbars # [Run/Present] [Stop] [New] [Open] [Save] -toolbar.run = 실행 +toolbar.run = 실행 toolbar.present = 전체 화면 -toolbar.stop = 정지 +toolbar.stop = 정지 +# --- toolbar.new = 새 스케치 -toolbar.open = 열기 +toolbar.open = 열기 toolbar.save = 저장 toolbar.export_application = 어플리케이션으로 내보내기 -toolbar.add_mode = 모드 추가... +toolbar.add_mode = 모드 추가... # --------------------------------------- # Editor # [Tab1] [Tab2] [v] -editor.header.new_tab = 새 탭 -editor.header.rename = 탭 이름 변경 +editor.header.new_tab = 새 탭 +editor.header.rename = 탭 이름 변경 editor.header.delete = 삭제 editor.header.previous_tab = 이전 탭 -editor.header.next_tab = 다음 탭 -editor.header.delete.warning.title = Yeah, no. -editor.header.delete.warning.text = 스케치의 마지막 탭은 삭제할 수 없습니다. +editor.header.next_tab = 다음 탭 +editor.header.delete.warning.title = Yeah, no. +editor.header.delete.warning.text = 스케치의 마지막 탭은 삭제할 수 없습니다. # Tabs editor.tab.new = New Name @@ -239,28 +247,28 @@ editor.tab.rename.description = New name for file # Sketch editor.sketch.rename.description = New name for sketch -editor.status.autoformat.no_changes = 변경할 서식이 없습니다. -editor.status.autoformat.finished = 자동 서식 적용 완료 +editor.status.autoformat.no_changes = 변경할 서식이 없습니다. +editor.status.autoformat.finished = 자동 서식 적용 완료 editor.status.find_reference.select_word_first = 레퍼런스에서 찾을 단어를 선택하세요. editor.status.find_reference.not_available = "%s" 관련 레퍼런스 없음. editor.status.drag_and_drop.files_added.0 = 스케치에 추가된 파일 없음. editor.status.drag_and_drop.files_added.1 = 스케치에 1개의 파일 추가. editor.status.drag_and_drop.files_added.n = 스케치에 %d개의 파일 추가. -editor.status.saving = 저장 중... +editor.status.saving = 저장 중... editor.status.saving.done = 저장 완료. -editor.status.saving.canceled = 저장 취소. -editor.status.printing = 인쇄 중... -editor.status.printing.done = 인쇄 완료. -editor.status.printing.error = 인쇄 중 오류 발생. -editor.status.printing.canceled = 인쇄 취소. +editor.status.saving.canceled = 저장 취소. +editor.status.printing = 인쇄 중... +editor.status.printing.done = 인쇄 완료. +editor.status.printing.error = 인쇄 중 오류 발생. +editor.status.printing.canceled = 인쇄 취소. # --------------------------------------- # Contribution Panel contrib = Contribution Manager -contrib.category = 카테고리: -contrib.filter_your_search = 검색 필터... +contrib.category = 카테고리: +contrib.filter_your_search = 검색 필터... contrib.restart = Restart Processing contrib.unsaved_changes = Unsaved changes have been found contrib.unsaved_changes.prompt = Are you sure you want to restart Processing without saving first? @@ -279,13 +287,13 @@ contrib.errors.install_failed = Install failed. contrib.errors.update_on_restart_failed = Update on restart of %s failed. contrib.errors.temporary_directory = Could not write to temporary directory. contrib.all = All -contrib.undo = 입력 취소 +contrib.undo = 입력 취소 contrib.remove = 삭제 contrib.install = 설치 contrib.progress.installing = Installing contrib.progress.starting = 시작 중 -contrib.progress.downloading = 다운로드 중 -contrib.download_error = 외부 라이브러리 다운로드 중 에러 발생. +contrib.progress.downloading = 다운로드 중 +contrib.download_error = 외부 라이브러리 다운로드 중 에러 발생. contrib.unsupported_operating_system = 외부 라이브러리가 해당 컴퓨터의 운영체제를 지원하지 않습니다. %s의 웹페이지에 방문하여 확인해 보세요. # --------------------------------------- diff --git a/build/shared/lib/languages/PDE_nl.properties b/build/shared/lib/languages/PDE_nl.properties index 61931278c..a126e8d37 100644 --- a/build/shared/lib/languages/PDE_nl.properties +++ b/build/shared/lib/languages/PDE_nl.properties @@ -2,13 +2,13 @@ # --------------------------------------- # Language: Dutch (Nederlands) (nl) -# --------------------------------------- +# --------------------------------------- # --------------------------------------- # Menu -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | File | menu.file = Bestand menu.file.new = Nieuw @@ -26,7 +26,7 @@ menu.file.print = Afdrukken... menu.file.preferences = Instellingen... menu.file.quit = Afsluiten -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Edit | menu.edit = Bewerken menu.edit.undo = Ongedaan Maken @@ -45,21 +45,28 @@ menu.edit.find_next = Volgende Zoeken menu.edit.find_previous = Vorige Zoeken menu.edit.use_selection_for_find = Gebruik Selectie voor Zoeken -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Sketch | -menu.sketch = Schets -menu.sketch.show_sketch_folder = Toon Schets Map -menu.sketch.add_file = Bestand Toevoegen... - -# | File | Edit | Sketch | Library | Tools | Help | -# | Library | +menu.sketch.run = Uitvoeren +menu.sketch.present = Presenteren +menu.sketch.tweak = Tweak +menu.sketch.stop = Stoppen +# --- menu.library = Bibliotheek Importeren... menu.library.add_library = Bibliotheek Toevoegen... menu.library.contributed = Bijgedragen menu.library.no_core_libraries = Modus heeft geen standaard bibliotheken +# --- +menu.sketch = Schets +menu.sketch.show_sketch_folder = Toon Schets Map +menu.sketch.add_file = Bestand Toevoegen... -# | File | Edit | Sketch | Library | Tools | Help | -# | Tools | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Debug | +# ... + +# | File | Edit | Sketch | Debug | Tools | Help | +# | Tools | menu.tools = Tools menu.tools.color_selector = Kleur Selecteren... menu.tools.create_font = Lettertype Maken... @@ -68,8 +75,8 @@ menu.tools.fix_the_serial_lbrary = Seriële Bibliotheek Herstellen menu.tools.install_processing_java = Installeren "processing-java" menu.tools.add_tool = Tool Toevoegen... -# | File | Edit | Sketch | Library | Tools | Help | -# | Help | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Help | menu.help = Help menu.help.about = Over Processing menu.help.environment = Programmeeromgeving @@ -108,7 +115,7 @@ open = Een Processing schets openen... # Save (Frame) save = Schets map opslaan als... -save.title = Wilt u wijzigingen die zijn aangebracht in deze schets
opslaan voor het sluiten? +save.title = Wilt u wijzigingen die zijn aangebracht in deze schets
opslaan voor het sluiten? save.hint = Als u niet opslaat, zullen uw wijzigingen verloren gaan. save.btn.save = Opslaan save.btn.dont_save = Niet Opslaan @@ -159,7 +166,7 @@ preferences.file.hint = alleen aanpassen wanneer Processing niet actief is # Sketchbook Location (Frame) sketchbook_location = Selecteer nieuwe schetsboek locatie -# Sketchbook (Frame) +# Sketchbook (Frame) sketchbook = Schetsboek sketchbook.tree = Schetsboek @@ -172,7 +179,7 @@ export.platforms = Platforms export.options = Opties export.options.fullscreen = Volledig Scherm (Presenteer modus) export.options.show_stop_button = Tonen Stop knop -export.description.line1 = Exporteren naar Applicatie creëert dubbel-klikbare, +export.description.line1 = Exporteren naar Applicatie creëert dubbel-klikbare, export.description.line2 = zelfstandige applicaties voor de geselecteerde platforms. # Find (Frame) @@ -205,12 +212,13 @@ archive_sketch = Schets archiveren als... # --------------------------------------- -# Toolbar +# Toolbars # [Run/Present] [Stop] [New] [Open] [Save] toolbar.run = Uitvoeren toolbar.present = Presenteren toolbar.stop = Stoppen +# --- toolbar.new = Nieuw toolbar.open = Openen toolbar.save = Opslaan diff --git a/build/shared/lib/languages/PDE_pt.properties b/build/shared/lib/languages/PDE_pt.properties index 7920be5e7..bab0ebd84 100644 --- a/build/shared/lib/languages/PDE_pt.properties +++ b/build/shared/lib/languages/PDE_pt.properties @@ -2,13 +2,13 @@ # --------------------------------------- # Language: Portuguese (pt) -# --------------------------------------- +# --------------------------------------- # --------------------------------------- # Menu -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | File | menu.file = Arquivo menu.file.new = Novo @@ -25,7 +25,7 @@ menu.file.print = Imprimir... menu.file.preferences = Preferências... menu.file.quit = Sair -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Edit | menu.edit = Editar menu.edit.undo = Desfazer @@ -44,21 +44,28 @@ menu.edit.find_next = Procurar Seguinte menu.edit.find_previous = Procurar Anterior menu.edit.use_selection_for_find = Usar Selecção para Procurar -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Sketch | -menu.sketch = Sketch -menu.sketch.show_sketch_folder = Ver Pasta de Sketch -menu.sketch.add_file = Adicionar Ficheiro... - -# | File | Edit | Sketch | Library | Tools | Help | -# | Library | +menu.sketch.run = Executar +menu.sketch.present = Apresentar +menu.sketch.tweak = Tweak +menu.sketch.stop = Parar +# --- menu.library = Importar Biblioteca... menu.library.add_library = Adicionar Biblioteca... menu.library.contributed = Contribuidas menu.library.no_core_libraries = O modo não tem bibliotecas incluídas +# --- +menu.sketch = Sketch +menu.sketch.show_sketch_folder = Ver Pasta de Sketch +menu.sketch.add_file = Adicionar Ficheiro... -# | File | Edit | Sketch | Library | Tools | Help | -# | Tools | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Debug | +# ... + +# | File | Edit | Sketch | Debug | Tools | Help | +# | Tools | menu.tools = Ferramentas menu.tools.color_selector = Selector de Côr... menu.tools.create_font = Criar Fonte... @@ -67,8 +74,8 @@ menu.tools.fix_the_serial_lbrary = Corrijir a Biblioteca Serial menu.tools.install_processing_java = Instalar "processing-java" menu.tools.add_tool = Adicionar Ferramenta... -# | File | Edit | Sketch | Library | Tools | Help | -# | Help | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Help | menu.help = Ajuda menu.help.about = Acerca do Processing menu.help.environment = Ambiente @@ -107,7 +114,7 @@ open = Abrir um sketch de Processing... # Save (Frame) save = Guardar pasta do sketch como... -save.title = Deseja guardar as alterções a este sketch
antes de fechar? +save.title = Deseja guardar as alterções a este sketch
antes de fechar? save.hint = Se não guardar as suas alterações serão perdidas. save.btn.save = Guardar save.btn.dont_save = Não Guardar @@ -123,7 +130,7 @@ preferences.editor_font_size = Tamanho da fonte do Editor preferences.console_font_size = Tamanho da fonte da Consola preferences.background_color = Côr de fundo em modo de Apresentação preferences.use_smooth_text = Utilizar texto suavizado na janela do editor -preferences.enable_complex_text_input = Activar inserção de caracteres complexos +preferences.enable_complex_text_input = Activar inserção de caracteres complexos preferences.enable_complex_text_input_example = ex. Japonês preferences.continuously_check = Verificação contínua de erros preferences.show_warnings = Mostrar avisos @@ -155,7 +162,7 @@ export.platforms = Plataformas export.options = Opções export.options.fullscreen = Ecrã Inteiro (Modo de Apresentação) export.options.show_stop_button = Mostrar botão de Parar -export.description.line1 = Exportar para Aplicação cria uma aplicação executavél, +export.description.line1 = Exportar para Aplicação cria uma aplicação executavél, export.description.line2 = para as plataformas seleccionadas. # Find (Frame) @@ -169,7 +176,7 @@ find.btn.replace_all = Substituir Todas find.btn.replace = Substituir find.btn.find_and_replace = Procurar e Substituir find.btn.previous = Anterior -find.btn.find = Seguinte +find.btn.find = Seguinte # Find in reference (Frame) find_in_reference = Procurar na Referência @@ -188,12 +195,13 @@ archive_sketch = Arquivar sketch como... # --------------------------------------- -# Toolbar +# Toolbars # [Run/Present] [Stop] [New] [Open] [Save] toolbar.run = Executar toolbar.present = Apresentar toolbar.stop = Parar +# --- toolbar.new = Novo toolbar.open = Abrir toolbar.save = Guardr @@ -205,7 +213,7 @@ toolbar.add_mode = Adicionar modo... # Editor # [Tab1] [Tab2] [v] -editor.header.new_tab = Nova Aba +editor.header.new_tab = Nova Aba editor.header.rename = Renomear editor.header.delete = Apagar editor.header.previous_tab = Aba Anterior diff --git a/build/shared/lib/languages/PDE_tr.properties b/build/shared/lib/languages/PDE_tr.properties index a9263aa2b..7a580c53d 100644 --- a/build/shared/lib/languages/PDE_tr.properties +++ b/build/shared/lib/languages/PDE_tr.properties @@ -8,7 +8,7 @@ # --------------------------------------- # Menu -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | File | menu.file = Dosya menu.file.new = Yeni @@ -26,7 +26,7 @@ menu.file.print = Yazdır menu.file.preferences = Tercihler menu.file.quit = Çıkış -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Edit | menu.edit = Düzenle menu.edit.undo = Geri Al @@ -45,21 +45,28 @@ menu.edit.find_next = Sonrakini Bul menu.edit.find_previous = Öncekini Bul menu.edit.use_selection_for_find = Seçimi Bul -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Sketch | -menu.sketch = Sketch -menu.sketch.show_sketch_folder = Sketch Klasörünü Görüntüle -menu.sketch.add_file = Dosya Ekle... - -# | File | Edit | Sketch | Library | Tools | Help | -# | Library | +menu.sketch.run = Çalıştır +menu.sketch.present = Sürmekte +menu.sketch.tweak = Tweak +menu.sketch.stop = Durdur +# --- menu.library = Kütüphane... menu.library.add_library = Kütüphane Ekle... menu.library.contributed = Yüklenenler menu.library.no_core_libraries = Esas mod kütüphaneleri yoktur +# --- +menu.sketch = Sketch +menu.sketch.show_sketch_folder = Sketch Klasörünü Görüntüle +menu.sketch.add_file = Dosya Ekle... -# | File | Edit | Sketch | Library | Tools | Help | -# | Tools | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Debug | +# ... + +# | File | Edit | Sketch | Debug | Tools | Help | +# | Tools | menu.tools = Araçlar menu.tools.color_selector = Renk Seçici menu.tools.create_font = Yazı Tipi Oluştur... @@ -68,8 +75,8 @@ menu.tools.fix_the_serial_lbrary = "Serial Kütüphanesi"ni Onar... menu.tools.install_processing_java = "Processing-Java"yı Yükle... menu.tools.add_tool = Araç Ekle... -# | File | Edit | Sketch | Library | Tools | Help | -# | Help | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Help | menu.help = Yardım menu.help.about = Processing Hakkında (en) menu.help.environment = Ortam (en) @@ -125,7 +132,7 @@ preferences.console_font_size = Konsol Yazı Tipi Boyutu preferences.background_color = Sunum sırasındaki arkaplan rengi preferences.use_smooth_text = Editör penceresinde yazıyı yumuşat preferences.enable_complex_text_input = Latin olmayan karakter girişini etkinleştir -preferences.enable_complex_text_input_example = örn.: Japonca, +preferences.enable_complex_text_input_example = örn.: Japonca, preferences.continuously_check = Hataları sürekli tespit et preferences.show_warnings = Uyarıları göster preferences.code_completion = Otomatik kod tamamlama @@ -190,17 +197,20 @@ archive_sketch = ... olarak Arşivle # --------------------------------------- -# Toolbar +# Toolbars # [Run/Present] [Stop] [New] [Open] [Save] toolbar.run = Çalıştır toolbar.present = Sürmekte toolbar.stop = Durdur +# --- toolbar.new = Yeni toolbar.open = Aç toolbar.save = Kaydet toolbar.export_application = Uygulama Aktarımı toolbar.add_mode = Mod ekle... + + # --------------------------------------- # Editor diff --git a/build/shared/lib/languages/PDE_zh.properties b/build/shared/lib/languages/PDE_zh.properties index 0fc905d93..ef4e626d8 100644 --- a/build/shared/lib/languages/PDE_zh.properties +++ b/build/shared/lib/languages/PDE_zh.properties @@ -2,13 +2,13 @@ # --------------------------------------- # CHINESE (zh) -# --------------------------------------- +# --------------------------------------- # --------------------------------------- # Menu -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | File | menu.file = 文件 menu.file.new = 新建 @@ -25,7 +25,7 @@ menu.file.print = 打印... menu.file.preferences = 偏好设定... menu.file.quit = 退出 -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Edit | menu.edit = 编辑 menu.edit.undo = 撤销 @@ -44,21 +44,28 @@ menu.edit.find_next = 查找下一个 menu.edit.find_previous = 查找上一个 menu.edit.use_selection_for_find = 使用当前选定查找 -# | File | Edit | Sketch | Library | Tools | Help | +# | File | Edit | Sketch | Debug | Tools | Help | # | Sketch | -menu.sketch = 速写本 -menu.sketch.show_sketch_folder = 打开程序目录 -menu.sketch.add_file = 添加文件... - -# | File | Edit | Sketch | Library | Tools | Help | -# | Library | +menu.sketch.run = 运行 +menu.sketch.present = 展示模式 +menu.sketch.tweak = Tweak +menu.sketch.stop = 停止 +# --- menu.library = 引用库文件... menu.library.add_library = 添加库文件... menu.library.contributed = 第三方贡献库 menu.library.no_core_libraries = 该模式下无核心库文件 +# --- +menu.sketch = 速写本 +menu.sketch.show_sketch_folder = 打开程序目录 +menu.sketch.add_file = 添加文件... -# | File | Edit | Sketch | Library | Tools | Help | -# | Tools | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Debug | +# ... + +# | File | Edit | Sketch | Debug | Tools | Help | +# | Tools | menu.tools = 工具 menu.tools.color_selector = 颜色选择器... menu.tools.create_font = 创建字体... @@ -67,8 +74,8 @@ menu.tools.fix_the_serial_lbrary = 修复串口库文件 menu.tools.install_processing_java = 安装 "processing-java" menu.tools.add_tool = 添加工具... -# | File | Edit | Sketch | Library | Tools | Help | -# | Help | +# | File | Edit | Sketch | Debug | Tools | Help | +# | Help | menu.help = 帮助 menu.help.about = 关于 Processing menu.help.environment = 开发环境 @@ -107,7 +114,7 @@ open = 打开 Processing 速写本... # Save (Frame) save = 保存速写本文件夹为... -save.title = 在关闭前你想要保存该速写本更改内容么
? +save.title = 在关闭前你想要保存该速写本更改内容么
? save.hint = 如果你没保存, 你所有的更改内容将丢失. save.btn.save = 保存 save.btn.dont_save = 不保存 @@ -132,7 +139,7 @@ preferences.background_color.tip = \ 展示模式通常被用来在全屏模式下展示速写程序,
\ 可从速写本菜单中访问. preferences.use_smooth_text = 在编辑器窗口中使用平滑字体 -preferences.enable_complex_text_input = 启用复杂字体输入 +preferences.enable_complex_text_input = 启用复杂字体输入 preferences.enable_complex_text_input_example = i.e. Japanese preferences.continuously_check = 不断检查错误 preferences.show_warnings = 显示警告 @@ -158,7 +165,7 @@ preferences.file.hint = 请在Processing不在运行时编辑该文件 # Sketchbook Location (Frame) sketchbook_location = 选择新速写本位置 -# Sketchbook (Frame) +# Sketchbook (Frame) sketchbook = Sketchbook sketchbook.tree = Sketchbook @@ -171,7 +178,7 @@ export.platforms = 系统平台 export.options = 选项 export.options.fullscreen = 全屏 (展示模式) export.options.show_stop_button = 显示停止按钮 -export.description.line1 = 为输出程序创建双击事件, +export.description.line1 = 为输出程序创建双击事件, export.description.line2 = 为所选系统创建独立运行程序. # Find (Frame) @@ -185,7 +192,7 @@ find.btn.replace_all = 全部替换 find.btn.replace = 替换 find.btn.find_and_replace = 搜索 & 替换 find.btn.previous = 上一个 -find.btn.find = 搜索 +find.btn.find = 搜索 # Find in reference (Frame) find_in_reference = 在参考文档中搜索 @@ -208,12 +215,13 @@ archive_sketch = 速写本压缩输出... # --------------------------------------- -# Toolbar +# Toolbars # [Run/Present] [Stop] [New] [Open] [Save] toolbar.run = 运行 toolbar.present = 展示模式 toolbar.stop = 停止 +# --- toolbar.new = 新建 toolbar.open = 打开 toolbar.save = 保存 diff --git a/pdex/src/processing/mode/experimental/DebugEditor.java b/pdex/src/processing/mode/experimental/DebugEditor.java index a4385d499..ab2a29c04 100755 --- a/pdex/src/processing/mode/experimental/DebugEditor.java +++ b/pdex/src/processing/mode/experimental/DebugEditor.java @@ -71,6 +71,7 @@ import org.eclipse.jdt.core.compiler.IProblem; import processing.app.Base; import processing.app.EditorState; import processing.app.EditorToolbar; +import processing.app.Language; import processing.app.Mode; import processing.app.Preferences; import processing.app.Sketch; @@ -507,10 +508,10 @@ public class DebugEditor extends JavaEditor implements ActionListener { * @return The debug menu */ protected JMenu buildDebugMenu() { - debugMenu = new JMenu("Debug"); + debugMenu = new JMenu(Language.text("menu.debug")); //debugMenu = new JMenu("PDE X"); - JCheckBoxMenuItem toggleDebugger = new JCheckBoxMenuItem("Show Debug Toolbar"); + JCheckBoxMenuItem toggleDebugger = new JCheckBoxMenuItem(Language.text("menu.debug.show_debug_toolbar")); toggleDebugger.setSelected(false); toggleDebugger.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -518,37 +519,37 @@ public class DebugEditor extends JavaEditor implements ActionListener { } }); debugMenu.add(toggleDebugger); - debugMenuItem = Toolkit.newJMenuItemAlt("Debug", KeyEvent.VK_R); + debugMenuItem = Toolkit.newJMenuItemAlt(Language.text("menu.debug.debug"), KeyEvent.VK_R); debugMenuItem.addActionListener(this); - continueMenuItem = Toolkit.newJMenuItem("Continue", KeyEvent.VK_U); + continueMenuItem = Toolkit.newJMenuItem(Language.text("menu.debug.continue"), KeyEvent.VK_U); continueMenuItem.addActionListener(this); - stopMenuItem = new JMenuItem("Stop"); + stopMenuItem = new JMenuItem(Language.text("menu.debug.stop")); stopMenuItem.addActionListener(this); - toggleBreakpointMenuItem = Toolkit.newJMenuItem("Toggle Breakpoint", KeyEvent.VK_B); + toggleBreakpointMenuItem = Toolkit.newJMenuItem(Language.text("menu.debug.toggle_breakpoint"), KeyEvent.VK_B); toggleBreakpointMenuItem.addActionListener(this); - listBreakpointsMenuItem = new JMenuItem("List Breakpoints"); + listBreakpointsMenuItem = new JMenuItem(Language.text("menu.debug.list_breakpoints")); listBreakpointsMenuItem.addActionListener(this); - stepOverMenuItem = Toolkit.newJMenuItem("Step", KeyEvent.VK_J); + stepOverMenuItem = Toolkit.newJMenuItem(Language.text("menu.debug.step"), KeyEvent.VK_J); stepOverMenuItem.addActionListener(this); - stepIntoMenuItem = Toolkit.newJMenuItemShift("Step Into", KeyEvent.VK_J); + stepIntoMenuItem = Toolkit.newJMenuItemShift(Language.text("menu.debug.step_into"), KeyEvent.VK_J); stepIntoMenuItem.addActionListener(this); - stepOutMenuItem = Toolkit.newJMenuItemAlt("Step Out", KeyEvent.VK_J); + stepOutMenuItem = Toolkit.newJMenuItemAlt(Language.text("menu.debug.step_out"), KeyEvent.VK_J); stepOutMenuItem.addActionListener(this); - printStackTraceMenuItem = new JMenuItem("Print Stack Trace"); + printStackTraceMenuItem = new JMenuItem(Language.text("menu.debug.print_stack_trace")); printStackTraceMenuItem.addActionListener(this); - printLocalsMenuItem = new JMenuItem("Print Locals"); + printLocalsMenuItem = new JMenuItem(Language.text("menu.debug.print_locals")); printLocalsMenuItem.addActionListener(this); - printThisMenuItem = new JMenuItem("Print Fields"); + printThisMenuItem = new JMenuItem(Language.text("menu.debug.print_fields")); printThisMenuItem.addActionListener(this); - printSourceMenuItem = new JMenuItem("Print Source Location"); + printSourceMenuItem = new JMenuItem(Language.text("menu.debug.print_source_location")); printSourceMenuItem.addActionListener(this); - printThreads = new JMenuItem("Print Threads"); + printThreads = new JMenuItem(Language.text("menu.debug.print_threads")); printThreads.addActionListener(this); - toggleVariableInspectorMenuItem = Toolkit.newJMenuItem("Toggle Variable Inspector", KeyEvent.VK_I); + toggleVariableInspectorMenuItem = Toolkit.newJMenuItem(Language.text("menu.debug.toggle_variable_inspector"), KeyEvent.VK_I); toggleVariableInspectorMenuItem.addActionListener(this); debugMenu.add(debugMenuItem); @@ -666,11 +667,11 @@ public class DebugEditor extends JavaEditor implements ActionListener { }); debugMenu.add(jitem); */ - showOutline = Toolkit.newJMenuItem("Show Sketch Outline", KeyEvent.VK_L); + showOutline = Toolkit.newJMenuItem(Language.text("menu.debug.show_sketch_outline"), KeyEvent.VK_L); showOutline.addActionListener(this); debugMenu.add(showOutline); - showTabOutline = Toolkit.newJMenuItem("Show Tabs List", KeyEvent.VK_Y); + showTabOutline = Toolkit.newJMenuItem(Language.text("menu.debug.show_tabs_list"), KeyEvent.VK_Y); showTabOutline.addActionListener(this); debugMenu.add(showTabOutline); @@ -708,7 +709,7 @@ public class DebugEditor extends JavaEditor implements ActionListener { } }); - JMenuItem enableTweak = Toolkit.newJMenuItemShift("Tweak", 'T'); + JMenuItem enableTweak = Toolkit.newJMenuItemShift(Language.text("menu.sketch.tweak"), 'T'); enableTweak.setSelected(ExperimentalMode.enableTweak); enableTweak.addActionListener(new ActionListener() { @Override diff --git a/pdex/src/processing/mode/experimental/DebugToolbar.java b/pdex/src/processing/mode/experimental/DebugToolbar.java index d22f11fab..599592e51 100755 --- a/pdex/src/processing/mode/experimental/DebugToolbar.java +++ b/pdex/src/processing/mode/experimental/DebugToolbar.java @@ -26,6 +26,7 @@ import java.util.logging.Logger; import processing.app.Base; import processing.app.Editor; +import processing.app.Language; import processing.app.Toolkit; import processing.mode.java.JavaToolbar; @@ -156,22 +157,22 @@ public class DebugToolbar extends JavaToolbar { // return JavaToolbar.getTitle(JavaToolbar.EXPORT, shift); case DEBUG: if (shift) { - return "Run"; + return Language.text("toolbar.run"); } else { - return "Debug"; + return Language.text("toolbar.debug.debug"); } case CONTINUE: - return "Continue"; + return Language.text("toolbar.debug.continue"); case TOGGLE_BREAKPOINT: - return "Toggle Breakpoint"; + return Language.text("toolbar.debug.toggle_breakpoints"); case STEP: if (shift) { - return "Step Into"; + return Language.text("toolbar.debug.step_into"); } else { - return "Step"; + return Language.text("toolbar.debug.step"); } case TOGGLE_VAR_INSPECTOR: - return "Variable Inspector"; + return Language.text("toolbar.debug.variable_inspector"); } return null; } diff --git a/pdex/src/processing/mode/experimental/ErrorCheckerService.java b/pdex/src/processing/mode/experimental/ErrorCheckerService.java index 631d1d0fb..1ab2ddae6 100644 --- a/pdex/src/processing/mode/experimental/ErrorCheckerService.java +++ b/pdex/src/processing/mode/experimental/ErrorCheckerService.java @@ -897,19 +897,21 @@ public class ErrorCheckerService implements Runnable{ + "folder>/libraries folder or in the code folder of your sketch"); } - String codeFolderPath[] = PApplet.split( - codeFolderClassPath.substring(1).trim(), - File.pathSeparatorChar); - try { - for (int i = 0; i < codeFolderPath.length; i++) { - classpathJars.add(new File(codeFolderPath[i]) - .toURI().toURL()); + else { + String codeFolderPath[] = PApplet.split( + codeFolderClassPath.substring(1).trim(), + File.pathSeparatorChar); + try { + for (int i = 0; i < codeFolderPath.length; i++) { + classpathJars.add(new File(codeFolderPath[i]) + .toURI().toURL()); + } + + } catch (Exception e2) { + System.out + .println("Yikes! codefolder, prepareImports(): " + + e2); } - - } catch (Exception e2) { - System.out - .println("Yikes! codefolder, prepareImports(): " - + e2); } } else { System.err.println("Experimental Mode: Yikes! Can't find \"" diff --git a/pdex/src/processing/mode/experimental/ErrorMessageSimplifier.java b/pdex/src/processing/mode/experimental/ErrorMessageSimplifier.java index a9285207a..177d5d629 100644 --- a/pdex/src/processing/mode/experimental/ErrorMessageSimplifier.java +++ b/pdex/src/processing/mode/experimental/ErrorMessageSimplifier.java @@ -83,11 +83,16 @@ public class ErrorMessageSimplifier { + "\" should go here"; } else { - result = "Problem with code syntax: Consider removing \"" + args[0] + result = "Code error on \"" + args[0] + "\""; } } break; + case IProblem.ParsingErrorDeleteToken: + if (args.length > 0) { + result = "Code error on \"" + args[0] + "\""; + } + break; case IProblem.ParsingErrorInsertToComplete: if (args.length > 0) { if (args[0].length() == 1) { @@ -110,8 +115,7 @@ public class ErrorMessageSimplifier { result = "\"color\" and \"int\" are reserved words & can't be used as variable names"; } else { - result = "\"" + args[0] - + "\" is a reserved word, it can't be used as a variable name"; + result = "Code error on \"" + args[0] + "\""; } } } diff --git a/pdex/src/processing/mode/experimental/ExperimentalMode.java b/pdex/src/processing/mode/experimental/ExperimentalMode.java index bf7dbf3bd..8b8992bae 100755 --- a/pdex/src/processing/mode/experimental/ExperimentalMode.java +++ b/pdex/src/processing/mode/experimental/ExperimentalMode.java @@ -140,7 +140,7 @@ public class ExperimentalMode extends JavaMode { debugOutputEnabled = false, errorLogsEnabled = false, autoSaveEnabled = true, autoSavePromptEnabled = true, defaultAutoSaveEnabled = true, // ,untitledAutoSaveEnabled; - ccTriggerEnabled = false, importSuggestEnabled = true; + ccTriggerEnabled = true, importSuggestEnabled = true; public static int autoSaveInterval = 3; //in minutes /** diff --git a/pdex/src/processing/mode/experimental/TextArea.java b/pdex/src/processing/mode/experimental/TextArea.java index 4b3b247d9..a17cd2dee 100644 --- a/pdex/src/processing/mode/experimental/TextArea.java +++ b/pdex/src/processing/mode/experimental/TextArea.java @@ -226,7 +226,13 @@ public class TextArea extends JEditTextArea { } final KeyEvent evt2 = evt; - if (keyChar == ' ') { + + if (keyChar == '.') { + if (ExperimentalMode.codeCompletionsEnabled && ExperimentalMode.ccTriggerEnabled) { + log("[KeyEvent]" + KeyEvent.getKeyText(evt2.getKeyCode()) + " |Prediction started"); + log("Typing: " + fetchPhrase(evt2)); + } + } else if (keyChar == ' ') { // Trigger on Ctrl-Space if (!Base.isMacOS() && ExperimentalMode.ccTriggerEnabled && (evt.isControlDown() || evt.isMetaDown())) { SwingWorker worker = new SwingWorker() { diff --git a/pdex/src/processing/mode/experimental/XQConsoleToggle.java b/pdex/src/processing/mode/experimental/XQConsoleToggle.java index d34b9899c..b7ee4025e 100755 --- a/pdex/src/processing/mode/experimental/XQConsoleToggle.java +++ b/pdex/src/processing/mode/experimental/XQConsoleToggle.java @@ -32,6 +32,8 @@ import java.awt.event.MouseListener; import javax.swing.JPanel; +import processing.app.Language; + /** * Toggle Button displayed in the editor line status panel for toggling bewtween * console and problems list. Glorified JPanel. @@ -41,7 +43,7 @@ import javax.swing.JPanel; */ public class XQConsoleToggle extends JPanel implements MouseListener { - public static final String CONSOLE = "Console", ERRORSLIST = "Errors" ; + public static final String CONSOLE = Language.text("editor.footer.console"), ERRORSLIST = Language.text("editor.footer.errors") ; private boolean toggleText = true; private boolean toggleBG = true; diff --git a/pdex/src/processing/mode/experimental/XQErrorTable.java b/pdex/src/processing/mode/experimental/XQErrorTable.java index 2e1c23aa7..b3609c897 100755 --- a/pdex/src/processing/mode/experimental/XQErrorTable.java +++ b/pdex/src/processing/mode/experimental/XQErrorTable.java @@ -30,6 +30,8 @@ import javax.swing.SwingWorker; import javax.swing.table.JTableHeader; import javax.swing.table.TableModel; +import processing.app.Language; + /** * Custom JTable implementation for XQMode. Minor tweaks and addtions. * @@ -41,7 +43,7 @@ public class XQErrorTable extends JTable { /** * Column Names of JTable */ - public static final String[] columnNames = { "Problem", "Tab", "Line" }; + public static final String[] columnNames = { Language.text("editor.footer.errors.problem"), Language.text("editor.footer.errors.tab"), Language.text("editor.footer.errors.line") }; /** * Column Widths of JTable. diff --git a/todo.txt b/todo.txt index 593a311ac..98cce7130 100644 --- a/todo.txt +++ b/todo.txt @@ -101,7 +101,7 @@ _ clean out the repo _ https://github.com/processing/processing/issues/1898 -gsoc/help me +help me _ `return` keyword not treated as such when followed by a bracket _ https://github.com/processing/processing/issues/2099 _ IllegalArgumentException when clicking between editor windows @@ -125,6 +125,10 @@ _ problems with non-US keyboards and some shortcuts _ https://github.com/processing/processing/issues/2199 _ improve start time by populating sketchbook/libraries on threads _ https://github.com/processing/processing/issues/2945 +_ clean up 'ant doc' target to remove warnings +_ https://github.com/processing/processing/issues/1492 +_ fix encodings, line endings, and mime types in the repo +_ https://github.com/processing/processing/issues/2955 medium