Changeset 3326 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2010-06-09T20:51:13+02:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/tools/I18n.java
r3296 r3326 27 27 private static PluralMode pluralMode = PluralMode.MODE_NOTONE; /* english default */ 28 28 private static String[] fileChooserDialogStringKeys = new String[] { 29 /* windows laf */ 29 30 "FileChooser.detailsViewActionLabelText", 30 31 "FileChooser.detailsViewButtonAccessibleName", … … 50 51 "FileChooser.upFolderAccessibleName", 51 52 "FileChooser.upFolderToolTipText", 52 "FileChooser.viewMenuLabelText"}; 53 "FileChooser.viewMenuLabelText", 54 55 /* gtk laf */ 56 "FileChooser.acceptAllFileFilterText", 57 "FileChooser.cancelButtonText", 58 "FileChooser.cancelButtonToolTipText", 59 "FileChooser.deleteFileButtonText", 60 "FileChooser.filesLabelText", 61 "FileChooser.filterLabelText", 62 "FileChooser.foldersLabelText", 63 "FileChooser.newFolderButtonText", 64 "FileChooser.newFolderDialogText", 65 "FileChooser.openButtonText", 66 "FileChooser.openButtonToolTipText", 67 "FileChooser.openDialogTitleText", 68 "FileChooser.pathLabelText", 69 "FileChooser.renameFileButtonText", 70 "FileChooser.renameFileDialogText", 71 "FileChooser.renameFileErrorText", 72 "FileChooser.renameFileErrorTitle", 73 "FileChooser.saveButtonText", 74 "FileChooser.saveButtonToolTipText", 75 "FileChooser.saveDialogTitleText", 76 77 /* motif laf */ 78 "FileChooser.cancelButtonText", 79 "FileChooser.cancelButtonToolTipText", 80 "FileChooser.enterFileNameLabelText", 81 "FileChooser.filesLabelText", 82 "FileChooser.filterLabelText", 83 "FileChooser.foldersLabelText", 84 "FileChooser.helpButtonText", 85 "FileChooser.helpButtonToolTipText", 86 "FileChooser.openButtonText", 87 "FileChooser.openButtonToolTipText", 88 "FileChooser.openDialogTitleText", 89 "FileChooser.pathLabelText", 90 "FileChooser.saveButtonText", 91 "FileChooser.saveButtonToolTipText", 92 "FileChooser.saveDialogTitleText", 93 "FileChooser.updateButtonText", 94 "FileChooser.updateButtonToolTipText" 95 }; 53 96 private static HashMap<String, String> strings = null; 54 97 private static HashMap<String, String[]> pstrings = null; … … 388 431 String loc = UIManager.getString(key, l); 389 432 // only provide custom translation if it is not already localized by Java 390 if (us .equals(loc)) {433 if (us != null && us.equals(loc)) { 391 434 UIManager.put(key, tr(us)); 392 435 }
Note:
See TracChangeset
for help on using the changeset viewer.