Index: applications/editors/josm/i18n/po/ar.po =================================================================== --- applications/editors/josm/i18n/po/ar.po (revision 20158) +++ applications/editors/josm/i18n/po/ar.po (revision 20175) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-21 11:11+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-24 20:09+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Arabic \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= " "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:31+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -72,6 +72,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -243,5 +244,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -387,5 +388,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -479,6 +480,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -691,5 +692,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -807,5 +808,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "نسخة مطابقة" @@ -2411,45 +2412,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2740,4 +2733,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2888,5 +2886,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "" @@ -2974,4 +2972,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -2981,4 +2980,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "" @@ -3366,27 +3366,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3396,5 +3396,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3487,5 +3487,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3493,5 +3493,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4162,5 +4162,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "حرّر" @@ -5027,5 +5027,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "" @@ -5409,5 +5409,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5563,5 +5563,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7299,5 +7299,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7506,21 +7506,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7529,5 +7536,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7536,47 +7543,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "نزّل الأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7585,25 +7592,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8038,5 +8045,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8045,19 +8052,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8067,33 +8074,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -10658,5 +10665,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "" @@ -10670,5 +10677,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12326,5 +12333,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16504,25 +16511,14 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -16675,23 +16671,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16700,7 +16696,7 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "" @@ -16708,80 +16704,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -16789,74 +16785,78 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" msgstr "" Index: applications/editors/josm/i18n/po/bg.po =================================================================== --- applications/editors/josm/i18n/po/bg.po (revision 20158) +++ applications/editors/josm/i18n/po/bg.po (revision 20175) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" "PO-Revision-Date: 2010-01-23 21:56+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:31+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:56+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,6 +71,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -247,5 +248,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -393,5 +394,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -485,6 +486,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -701,5 +702,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -818,5 +819,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Дублиране" @@ -2465,45 +2466,37 @@ "десния бутон на мишката" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2806,4 +2799,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2956,5 +2954,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "Двоен конфликт" @@ -3045,4 +3043,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3055,4 +3054,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "Потвърждение за изтриване" @@ -3454,27 +3454,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3484,5 +3484,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3575,5 +3575,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3581,5 +3581,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4242,5 +4242,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Редактиране" @@ -5113,5 +5113,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "Приложи" @@ -5491,5 +5491,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5645,5 +5645,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7383,5 +7383,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7592,21 +7592,28 @@ msgstr "Изтриване на текущо редактираната врзка" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "Да, създай конфликт и затвори" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "Не, продължава редактирането" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7615,5 +7622,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7622,47 +7629,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "Прилагане на обновяването и затваряне на прозореца." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "Прекъсване на обновяването и затваряне на диалоговия прозорец" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "Добави празен етикет" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Сваляне членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "Редактор на връзки: Сваляне на членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "Установява роля за избраните членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "Приложи роля" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7671,25 +7678,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "Да, приложи го!" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "Не, не прилагай!" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "Потвърди празна роля" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8128,5 +8135,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8135,19 +8142,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8157,33 +8164,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -10781,5 +10788,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Моля, изберете ред за редактиране" @@ -10793,5 +10800,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12480,5 +12487,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16745,28 +16752,14 @@ msgstr "Пресичащи се пътища" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Повтарящи се точки" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "Този тест проверява за точки, които се намират на едно и също място." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Вие се каните да изтриете възли, намиращи се извън зоната, която сте свалили " -"от сървъра.
Това може да предизвика проблеми, защото други обекти (които " -"не виждате) може да ги използват.
Наистина ли искате да ги триете?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "Потвърждение" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "Възли в една и съща позиция" @@ -16925,9 +16918,9 @@ "правописни грешки." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Проверка на параметрите:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "" @@ -16935,15 +16928,15 @@ "стойности" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Невалидна линия на таг-проверка - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Невалидна линия на правописна проверка: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16954,7 +16947,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "Неправилна комбинация маркер/стойност" @@ -16962,80 +16955,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "Проблем с изобразяването" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Неправилен ключ ''{0}''." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Маркери с празни стойности" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "Неправилен параметров ключ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "Неправилен интервал в ключ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "Стойност на параметър започва или завършва с интервал" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "Стойности съдържащи HTML елементи" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Ключ ''{0}'' не е намерен в шаблони." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "Шаблоните не съдържат такъв ключ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Стойността ''{0}'' за ключ ''{1}'' не е намерена в шаблоните." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "Шаблоните не съдържат стойност" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "ЗА ПОПРАВКА" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Проверка на ключовете." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "Проверяване за валидни ключове и сравняване със списък от думи." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "Използване на сложен параметров тест." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "Проверяване стойностите и маркерите използвайки по-сложни правила." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "Източници за TagChecker" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -17046,76 +17039,80 @@ "маркирането." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Добавяне нов източник в списъка." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "Редактиране избрания източник." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Изтриване на източник от списъка" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Източници на данни" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Проверка стойностите." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "Проверяване дали стойностите са правилни спрямо шаблони." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Проверка за маркерни \"ЗА ПОПРАВКА\"" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Търси точки или пътища с \"FIXME\" в някой стойност на ключ." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "Проверка за бележки при рисуване." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "Проверява дали картата при русиване е открила грешки в данните." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Използване на файл с данни по подразбиране." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Използване на файла с данни по подразбиране (препоръчвано)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Използване на файла за проверка на правопис по подразбиране." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "" "Използване на файла за проверка на правопис по подразбиране (препоръчвано)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Поправи параметрите" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "Не може да бъде открит типа на елемента" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -30557,4 +30554,17 @@ #~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Вие се каните да изтриете възли, намиращи се извън зоната, която сте " +#~ "свалили от сървъра.
Това може да предизвика проблеми, защото други " +#~ "обекти (които не виждате) може да ги използват.
Наистина ли искате да " +#~ "ги триете?" + +#~ msgid "Confirmation" +#~ msgstr "Потвърждение" + +#~ msgid "" #~ "There were problems with the following plugins:\n" #~ "\n" Index: applications/editors/josm/i18n/po/cs.po =================================================================== --- applications/editors/josm/i18n/po/cs.po (revision 20158) +++ applications/editors/josm/i18n/po/cs.po (revision 20175) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-24 11:00+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-25 12:08+0000\n" "Last-Translator: Jezevec \n" "Language-Team: Czech \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:25+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,6 +71,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -249,5 +250,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -395,5 +396,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -487,6 +488,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -702,5 +703,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -818,5 +819,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Duplikovat" @@ -2478,45 +2479,37 @@ "nahoru dolu doleva doprava; pohyb se zoomem možno též pravým tlačítkem myši" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "rozsah" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2818,4 +2811,10 @@ msgstr "Očekáváno ID prvku" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +#, fuzzy +msgid "Range of numbers expected" +msgstr "Očekáváno ID sady změn" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2972,5 +2971,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "Dvojí konflikt" @@ -3064,4 +3063,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3074,4 +3074,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "Potvrďte smazání" @@ -3471,27 +3472,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3501,5 +3502,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3592,5 +3593,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3598,5 +3599,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4262,5 +4263,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Upravit" @@ -5154,5 +5155,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "Aplikovat" @@ -5539,5 +5540,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5693,5 +5694,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "Vytvořit kopii relace a otevřít ji v novém okně" @@ -7443,5 +7444,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7666,21 +7667,28 @@ msgstr "Smazat editovanou relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "Ano, vytvořit konflikt a zavřít" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "Ne, pokračovat v editaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7689,5 +7697,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7696,47 +7704,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "Aplikovat aktuální změny" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "Aplikovat změny a zavřít dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "Zrušit změny a zavřít dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "Přidat prázdnou značku" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "Stáhnout všechny nekompletní členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Stáhnout prvky" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "Editor relací: Stáhnout členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "Stáhnout vybrané nekompletní členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "Nastaví roli pro vybrané členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "Aplikovat roli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7745,25 +7753,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "Ano, aplikovat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "Ne, neaplikovat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "Potvrdit prázdnou roli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "Upravit relaci na kterou odkazuje vybraný člen" @@ -8209,5 +8217,5 @@ "nepodařilo získat. Chybové hlášení (nepřeloženo):
{1}

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8216,19 +8224,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "Nepodařilo se otevřít URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "Otevřít aktuální stránku nápovědy v externím prohlížeči" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "Upravit aktuální stránku nápovědy" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8240,33 +8248,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "Znovu načíst aktuální stránku nápovědy" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "Přejít na předchozí stránku" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "Přejít na následující stránku" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "Jít na domovskou stránku nápovědy pro JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "Nepodařilo se otevřít stránku s nápovědou. Cílové URL je prázdné." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "Nepodařilo se otevřít stránku s nápovědou." @@ -10924,5 +10932,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Zvolte řádek k editaci" @@ -10936,5 +10944,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -11384,5 +11392,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 msgid "Show localized name in selection lists" -msgstr "" +msgstr "Zobrazovat lokalizované názvy v seznamu prvků" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -11398,5 +11406,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 msgid "Show localized name in selection lists, if available" -msgstr "" +msgstr "Zobrazovat lokalizované názvy v seznamu prvků, pokud jsou dostupné" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -12627,5 +12635,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -12806,6 +12814,7 @@ msgid "Uploading {0} object..." msgid_plural "Uploading {0} objects..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Nahrávám {0} objekt..." +msgstr[1] "Nahrávám {0} objekty..." +msgstr[2] "Nahrávám {0} objektů..." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 @@ -13356,6 +13365,7 @@ msgid "({0}/{1}) Uploading {2} object..." msgid_plural "({0}/{1}) Uploading {2} objects..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "({0}/{1}) Nahrávám {2} objekt..." +msgstr[1] "({0}/{1}) Nahrávám {2} objekty..." +msgstr[2] "({0}/{1}) Nahrávám {2} objektů..." #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187 @@ -13687,5 +13697,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:80 msgid "Processing plugin site cache files..." -msgstr "" +msgstr "Zpracovávám cache pluginů..." #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:84 @@ -13693,5 +13703,5 @@ #, java-format msgid "Processing file ''{0}''" -msgstr "" +msgstr "Zpracovávám soubor ''{0}''" #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:88 @@ -13703,5 +13713,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:105 msgid "Processing plugin files..." -msgstr "" +msgstr "Zpracovávám soubory pluginů..." #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:51 @@ -13712,5 +13722,5 @@ #, java-format msgid "Downloading plugin list from ''{0}''" -msgstr "" +msgstr "Stahuji seznam pluginů z ''{0}''" #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:166 @@ -13742,5 +13752,5 @@ #, java-format msgid "Processing plugin list from site ''{0}''" -msgstr "" +msgstr "Zpracovávám seznam pluginů z webu ''{0}''" #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:301 @@ -16916,28 +16926,14 @@ msgstr "Zkřížené cesty" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Duplicitní uzly" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Chystáte se smazat uzly mimo oblast, jež jste stáhli.
To může způsobit " -"problémy, protože jiné objekty (které nevidíte) je mohou používat." -"
Opravdu je chcete smazat?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "Potvrzení" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "Uzly na stejné pozici" @@ -17096,23 +17092,23 @@ msgstr "Tento test kontroluje cesty na podobnost jmen, kdy může jít o překlep." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Kontrola vlastností :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "Tento plugin kontroluje chyby klíčů a jejich hodnot." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -17123,7 +17119,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "Neplatná kombinace klíče/hodnoty" @@ -17131,80 +17127,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "Problém s vykreslováním" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Klíč ''{0}'' je neplatný." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Klíče s prázdnými hodnotami" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "Neplatné klíče vlastností" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "Neplatná mezera v klíči vlastnosti" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "Hodnota začíná nebo končí mezerou" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "Hodnota obsahuje HTML entitu" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Klíč ''{0}'' není v předvolbách." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "Předvolby neobsahují vlastnost klíč" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Hodnota ''{0}'' pro klíč ''{1}'' není v přednastavení" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "Předvolby neobsahují vlastnost hodnota" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "OPRAVY" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Kontrola klíčů vlastností." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "Kontroluje platnost klíčů vlastností proti seznamu slov." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "Použít komplexní kontrolu vlastností" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "Kontroluje platnost hodnot a tagů pomocí komplexních pravidel." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "zdroj TagCheckeru" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -17212,75 +17208,79 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Přidat nový zdroj do seznamu." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "Upravit zvolený zdroj." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Smazat vybraný zdroj ze seznamu." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Zdroje dat" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Kontrola hodnot vlastností." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "Kontroluje platnost hodnot vlastností proti přednastaveným hodnotám." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Zkontrolovat tagy s FIXME." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Najít cesty a body s FIXME v jakékoliv hodnotě vlastnosti." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "Kontroila, zda při kreslení mapy nebyly nalezeny chyby." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Použít stadardní datový soubor." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Použít standardní datový soubor (doporučeno)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "Použít standardní soubor ignorovaných tagů (doporučeno)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "Použít standardní slovník (doporučeno)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Opravit vlastnosti" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "Nelze najít typ elementu" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -30723,4 +30723,19 @@ msgstr "Sicily - Itálie" +#~ msgid "range" +#~ msgstr "rozsah" + +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Chystáte se smazat uzly mimo oblast, jež jste stáhli.
To může způsobit " +#~ "problémy, protože jiné objekty (které nevidíte) je mohou používat." +#~ "
Opravdu je chcete smazat?" + +#~ msgid "Confirmation" +#~ msgstr "Potvrzení" + #~ msgid "Email" #~ msgstr "E-mail" Index: applications/editors/josm/i18n/po/da.po =================================================================== --- applications/editors/josm/i18n/po/da.po (revision 20158) +++ applications/editors/josm/i18n/po/da.po (revision 20175) @@ -9,6 +9,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-21 11:21+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-24 20:14+0000\n" "Last-Translator: AJenbo \n" "Language-Team: Dansk \n" @@ -17,5 +17,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:32+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -72,6 +72,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -249,5 +250,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -395,5 +396,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -487,6 +488,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -704,5 +705,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -820,5 +821,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Duplikér" @@ -2477,45 +2478,37 @@ "højre; Flyt zoom med højre museknap" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2832,4 +2825,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2989,5 +2987,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "Dobbelt konflikt" @@ -3079,4 +3077,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3089,4 +3088,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "Bekræftelse af sletning" @@ -3505,27 +3505,27 @@ "ikke en kritisk fejl, så det skulle være sikkert at fortsætte dit arbejde." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "Manglende sammenlægningsmål for vej med id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "Manglende sammenlægningsmål for punkt med id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Manglende sammenlægningsmål for objekt med id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "Manglende sammenlægningsmål for relation med id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3535,5 +3535,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3631,5 +3631,5 @@ "er {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3637,5 +3637,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4308,5 +4308,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Redigér" @@ -5220,5 +5220,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "Anvend" @@ -5626,5 +5626,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5780,5 +5780,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7557,5 +7557,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7786,21 +7786,28 @@ msgstr "Slet den redigerede relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "Ja, opret en konflikt og luk" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "Klik for at oprette en konflikt og lukke denne relationseditor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "Nej, fortsæt redigeringen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7812,5 +7819,5 @@ "oprette en konflikt og lukke editoren?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7821,47 +7828,47 @@ "venligst denne konflikt først og prøv så igen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "Tilføj de aktuelle opdateringer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "Tilføj opdateringerne og luk dialogboksen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "Annullér opdateringerne og luk dialogen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "Tilføj en tom tag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "Download alle ufuldstændige medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Download medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "Relationseditor: Download medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "Download markerede ufuldstændige medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "Giver de markerede medlemmer en rolle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "Anvend rolle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7870,25 +7877,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "Vil du virkelig anvende den nye rolle?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "Ja, anvend den" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "Nej, anvend den ikke" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "Bekræft tom rolle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "Redigér den relation det nu markerede relationsmedlem refererer til" @@ -8339,5 +8346,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8346,19 +8353,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "Kunne ikke åbne URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "Åbn den nuværende Hjælp-side i en ekstern browser" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "Redigér den nuværende Hjælp-side" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8370,33 +8377,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "Hent den nuværende Hjælp-side igen" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "Gå til foregående side" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "Gå til næste side" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "Gå til JOSM's Hjælp-hjemmeside" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "Kunne ikke åbne Hjælp-side. URL'en er tom." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "Kunne ikke åbne Hjælp-side" @@ -11125,5 +11132,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Vælg venligst rækken, der skal rettes." @@ -11137,5 +11144,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12858,5 +12865,5 @@ msgstr "Kunne ikke åbne input-strøm for resurse ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -17148,10 +17155,10 @@ msgstr "Krydsende veje" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Dublet-punkter" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "" @@ -17159,19 +17166,5 @@ "sted." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Du er ved at slette punkter uden for det område du har downloadet.
Dette " -"kan medføre problemer, fordi andre objekter (som du ikke kan se) måske " -"bruger dem.
Ønsker du virkelig at slette?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "Bekræftelse" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -17335,23 +17328,23 @@ "stavet forkert." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Egenskabstjekker:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "Denne udvidelse tjekker for fejl i egenskabsnøgler og -værdier" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Ugyldig tagtjekker-linje - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ugyldig stavekontrol-linje: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -17362,7 +17355,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "Ugyldig kombination af tag/værdi" @@ -17370,81 +17363,81 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "Farvelægger problem" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Nøgle \"{0}\" er ugyldig" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Tags med tomme værdier" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "Ulovlig egenskabsnøgle" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "Ulovligt blanktegn i egenskabsnøgle" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "Egenskabsværdi begynder eller slutter med blanktegn" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "Egenskabsværdi indeholder HTML-kodet tegn" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Nøglen \"{0}\" er ikke fordefineret" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "Fordefinitionerne indeholder ikke egenskabs-nøglen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Værdien \"{0}\" for nøglen \"{1}\" er ikke fordefineret" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "Fordefinitionerne indeholder ikke egenskabs-værdi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "FIXMEs" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Tjek egenskabsnøgler" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" "Kontrollér at egenskabsnøglerne er gyldige ved at tjekke med en ordliste." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "Brug kompleks egenskabs-tjekker." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "TagChecker-kilde" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -17454,76 +17447,80 @@ "speller) kilder (URL eller filnavn) eller tagtjekkerdatafiler." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Tilføj en ny kilde til listen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "Ret den valgte kilde." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Slet den valgte kilde fra listen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Datakilder" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Tjek egenskabsværdier." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" "Godkend at egenskabs-værdier er gyldige tjeks i forhold til fordefinitioner." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Tjek for FIXMEs" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Søger efter punkter eller veje med FIXME i enhver egenskavsværdi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Brug standard-datafil." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Brug standard-datafilen (anbefales)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "Brug standardfil for ignorerede tags." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "Brug standardfilen for ignorerede tags (anbefalet)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Brug stavekontrollens standardfil." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "Brug stavekontrollens standardfil (anbefales)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Ret egenskaber" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "Kunne ikke finde element-typen" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -30985,4 +30982,16 @@ msgstr "Sicilen - Italien" +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Du er ved at slette punkter uden for det område du har downloadet." +#~ "
Dette kan medføre problemer, fordi andre objekter (som du ikke kan " +#~ "se) måske bruger dem.
Ønsker du virkelig at slette?" + +#~ msgid "Confirmation" +#~ msgstr "Bekræftelse" + #~ msgid "Move" #~ msgstr "Flyt" Index: applications/editors/josm/i18n/po/de.po =================================================================== --- applications/editors/josm/i18n/po/de.po (revision 20158) +++ applications/editors/josm/i18n/po/de.po (revision 20175) @@ -9,6 +9,6 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-24 14:41+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-24 20:48+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: German \n" @@ -17,5 +17,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:25+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -72,6 +72,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -250,5 +251,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -398,5 +399,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -490,6 +491,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -708,5 +709,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -824,5 +825,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Duplizieren" @@ -2514,45 +2515,37 @@ "runter, rechts; Zoom verschieben mit rechter Maus" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "Bereich" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2879,4 +2872,10 @@ msgstr "Erwarte eine Objekt-ID" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +#, fuzzy +msgid "Range of numbers expected" +msgstr "Änderungssatz-Nummer benötigt" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -3038,5 +3037,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "Doppelter Konflikt" @@ -3130,4 +3129,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3140,4 +3140,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "Löschbestätigung" @@ -3564,6 +3565,6 @@ "JOSM fortsetzen können." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" @@ -3571,6 +3572,6 @@ "Beim Zusammenführen wurde der Ziel-Weg für den Weg mit ID {0} nicht gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" @@ -3579,5 +3580,5 @@ "gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" @@ -3586,5 +3587,5 @@ "gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" @@ -3593,5 +3594,5 @@ "nicht gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3603,5 +3604,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3699,5 +3700,5 @@ "Änderungssatz-Nummer ist {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3705,5 +3706,5 @@ msgstr "Zusammenfügen nicht möglich, weil neue und alte Objekte enthalten sind" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4388,5 +4389,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Bearbeiten" @@ -5314,5 +5315,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "Übernehmen" @@ -5731,5 +5732,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5885,5 +5886,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7678,5 +7679,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7907,9 +7908,16 @@ msgstr "Diese Relation löschen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "Konflikt erstellen und schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" @@ -7917,9 +7925,9 @@ "schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "Bearbeitung fortsetzen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" @@ -7927,5 +7935,5 @@ "Relation wiederaufzunehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7937,5 +7945,5 @@ "

Soll ein Konflikt erstellt und der Editor geschlossen werden?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7946,47 +7954,47 @@ "Element
''{1}''.
Bitte lösen Sie diesen Konflikt zunächst auf." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "Aktualisierung übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "Updates anwenden und den Dialog schliessen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "Updates abbrechen und den Dialog schliessen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "Einen leeren Schlüssel hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "Alle unvollständigen Mitglieder herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "Relations-Editor: Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "Ausgewählte unvollständige Mitglieder herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "Definiert eine Rolle für die ausgewählten Elemente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "Rolle anwenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7995,25 +8003,25 @@ msgstr[1] "Eine leere Rolle wird {0} Objekten zugewiesen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "Dies ist equivalent zum Löschen der Rollen für diese Objekte." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "Soll die neue Rolle wirklich zugewiesen werden?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "Übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "Nicht übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "Leere Rolle bestätigen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten" @@ -8485,5 +8493,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8494,19 +8502,19 @@ "
Vermutlich ist Ihre Internet-Verbindung unterbrochen." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "Die URL konnte nicht geöffnet werden" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "Aktuelle Hilfeseite in einem externen Browser öffnen" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "Die aktuelle Hilfeseite bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8518,33 +8526,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "Die aktuelle Hilfeseite neu laden" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "Zur vorherigen Seite gehen" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "Zur nächsten Seite gehen" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "Gehe zur Start-Seite für die JOSM-Hilfe" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "Warnung: Falsche Position im HTML-Dokument. Der Fehler war: {0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "Die Hilfe-Seite konnte nicht geöffnet werden. Die Ziel-URL ist leer." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "Die Hilfe-Seite konnte nicht geladen werden" @@ -11399,5 +11407,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Bitte wählen Sie eine Zeile zum Bearbeiten." @@ -11411,5 +11419,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -13224,5 +13232,5 @@ "Das Öffnen eines Eingabestroms für die Resource ''{0}'' ist fehlgeschlagen." -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -17755,28 +17763,14 @@ msgstr "Überschneidende Wege" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Doppelte Knoten" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "Dieser Test prüft auf doppelte Knoten an der selben Stelle." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Sie sind dabei, Knoten außerhalb des heruntergeladenen Bereichs zu löschen." -"
Das kann zu Problemen führen, wenn andere Objekte (die Sie nicht sehen) " -"diese verwenden.
Wollen Sie die Knoten wirklich löschen?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "Bestätigung" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "Knoten auf derselben Position" @@ -17941,23 +17935,23 @@ "könnte." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Eigenschaftsprüfer:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "Dieses Plugin prüft auf Fehler in Schlüsseln und Werten" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Ungültige Zeile im Merkmalsprüfer - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ungültige Zeile im Rechtschreibprüfer: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -17968,7 +17962,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "Ungültige Schlüssel/Wert-Kombinationen" @@ -17976,80 +17970,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "Zeichenproblem" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Schlüssel \"{0}\" ungültig." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Merkmale mit leerem Wert" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "Ungültiger Schlüssel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "Ungültiger Leerraum in Schlüssel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "Werte beginnen oder enden mit Leerraum" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "Werte enthalten HTML-Entität" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Schlüssel \"{0}\" nicht in Vorlagen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "Vorlagen enthalten Schlüssel nicht" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Wert \"{0}\" für Schlüssel \"{1}\" nicht in Vorlagen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "Vorlagen enthalten Wert nicht" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "Korrekturnotizen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Schlüssel prüfen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "Schlüssel durch Abgleich mit einer Liste auf Gültigkeit prüfen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "Komplexen Eigenschaftsprüfer verwenden." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "Gültigkeit von Werten und Schlüsseln anhand komplexer Regeln prüfen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "Datenquelle für Merkmalsprüfer" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -18059,33 +18053,33 @@ "wiki.openstreetmap.org/index.php/User:JLS/speller) oder Merkmalsprüfung." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Eine neue Quelle zur Liste hinzufügen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "Ausgewählte Quelle bearbeiten." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Ausgewählte Quelle aus der Liste entfernen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Datenquellen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Werte überprüfen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "Prüft die Gültigkeit von Werten anhand von Objektvorlagen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Auf Korrekturnotizen prüfen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" @@ -18093,44 +18087,48 @@ "(fixme) stehen haben." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "Zeichennotizen prüfen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "Prüfen, ob beim Kartenzeichnen Fehler aufgetreten sind." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Standarddatendatei verwenden." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Nutzung der Standarddatendatei (empfohlen)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "Standarddatei zum Merkmale ignorieren verwenden." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" "Standarddatei zum Ignorieren von bekannten Merkmalen verwenden (empfohlen)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Standarddatei für Schreibprüfung verwenden." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "Standarddatei für die Schreibfehlerprüfung verwenden (empfohlen)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Eigenschaften korrigieren" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "Konnte Elementtyp nicht finden" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -31631,4 +31629,22 @@ msgstr "Sizilien - Italien" +#~ msgid "" +#~ msgstr "" + +#~ msgid "range" +#~ msgstr "Bereich" + +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Sie sind dabei, Knoten außerhalb des heruntergeladenen Bereichs zu " +#~ "löschen.
Das kann zu Problemen führen, wenn andere Objekte (die Sie " +#~ "nicht sehen) diese verwenden.
Wollen Sie die Knoten wirklich löschen?" + +#~ msgid "Confirmation" +#~ msgstr "Bestätigung" + #~ msgid "image" #~ msgid_plural "images" Index: applications/editors/josm/i18n/po/el.po =================================================================== --- applications/editors/josm/i18n/po/el.po (revision 20158) +++ applications/editors/josm/i18n/po/el.po (revision 20175) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-22 19:27+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-26 19:43+0000\n" "Last-Translator: aitolos \n" "Language-Team: Greek \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:25+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,6 +71,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -242,5 +243,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -386,5 +387,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -478,6 +479,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -640,9 +641,9 @@ #, java-format msgid "Combine {0} ways" -msgstr "Ένωσε {0} δρόμους" +msgstr "Ένωσε {0} διαδρομές" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244 msgid "Please select at least two ways to combine." -msgstr "Παρακαλώ επιλέξτε τουλάχιστον δυο δρόμους προς σύνδεση." +msgstr "Παρακαλώ επιλέξτε τουλάχιστον δυο διαδρομές προς σύνδεση." #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 @@ -694,5 +695,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -811,5 +812,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Αντιγραφή" @@ -898,5 +899,6 @@ #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17 msgid "Display history information about OSM ways, nodes, or relations." -msgstr "Εμφανίζει πληροφορίες ιστορικού σχετικα με δρόμους, κόμβους ή σχέσεις." +msgstr "" +"Εμφανίζει πληροφορίες ιστορικού σχετικα με διαδρομές, κόμβους ή σχέσεις." #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 @@ -908,5 +910,5 @@ msgid "Display object information about OSM nodes, ways, or relations." msgstr "" -"Εμφανίζει πληροφορίες αντικειμένου σχετικα με δρόμους, κόμβους ή σχέσεις." +"Εμφανίζει πληροφορίες αντικειμένου σχετικα με διαδρομές, κόμβους ή σχέσεις." #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114 @@ -1021,5 +1023,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 msgid "Join Node to Way" -msgstr "" +msgstr "Ένωση Κόμβου σε Διαδρομή" #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 @@ -1184,9 +1186,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "New" -msgstr "Νέα" +msgstr "Νέο" #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 msgid "Create a new map." -msgstr "Δημιοθργία καινούργιου χάρτη" +msgstr "Δημιουργία καινούργιου χάρτη" #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:47 @@ -1420,9 +1422,9 @@ #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 msgid "Redo" -msgstr "Επανάληψη" +msgstr "Επαναφορά" #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 msgid "Redo the last undone action." -msgstr "Επανάληψη της τελευταίας αναίρεσης." +msgstr "Επαναφορά της τελευταίας αναίρεσης." #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 @@ -1507,9 +1509,9 @@ #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 msgid "Reverse Ways" -msgstr "" +msgstr "Αντιστροφή Διαδρομών" #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 msgid "Reverse the direction of all selected ways." -msgstr "" +msgstr "Αντιστροφή κατεύθυνσης όλων των επιλεγμένων διαδρομών." #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45 @@ -1519,5 +1521,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" -msgstr "" +msgstr "Αντιστροφή Διαδρομών" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 @@ -1531,5 +1533,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238 msgid "Save the current data." -msgstr "Αποθήκευση τεχόντων δεδομένων." +msgstr "Αποθήκευση τρεχόντων δεδομένων." #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47 @@ -1713,9 +1715,9 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 msgid "Split Way" -msgstr "" +msgstr "Διαίρεση Διαδρομής" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73 msgid "Split a way at the selected node." -msgstr "" +msgstr "Διαίρεση διαδρομής στον επιλεγμένο κόμβο." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:91 @@ -1757,4 +1759,6 @@ msgid "You must select two or more nodes to split a circular way." msgstr "" +"Πρέπει να επιλέξετε δυο ή περισότερους κόμβους για να διαιρέσετε μια κυκλική " +"διαδρομή." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:279 @@ -1763,4 +1767,6 @@ "middle of the way.)" msgstr "" +"Η διαδρομή δεν μπορεί να διαιρεθεί στους επιλεγμένους κόμβους. (Σημ: " +"Επιλέξτε κόμβους στη μέση της διαδρομής.)" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450 @@ -1779,5 +1785,5 @@ #, java-format msgid "Split way {0} into {1} parts" -msgstr "" +msgstr "Διαίρεση διαδρομής {0} σε {1} μέρη" #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 @@ -1798,5 +1804,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54 msgid "UnGlue Ways" -msgstr "" +msgstr "Αποσύνδεση Διαδρομών" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 @@ -1818,5 +1824,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "The current selection cannot be used for unglueing." -msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για ξεκόλημα." +msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για αποσύνδεση." #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 @@ -1858,5 +1864,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166 msgid "Unglued Node" -msgstr "Ξεκολημένος Κόμβος" +msgstr "Αποσυνδεδεμένος Κόμβος" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 @@ -1903,5 +1909,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" -msgstr "" +msgstr "Ανανέωση δεδομένων" #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 @@ -2287,5 +2293,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938 msgid "Create new node." -msgstr "Δημιοθργία νέου κόμβου." +msgstr "Δημιουργία νέου κόμβου." #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943 @@ -2434,45 +2440,37 @@ "+πάνω, κάτω, αριστερά, δεξιά ή με το δεξί πλήκτρο του ποντικιού" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2765,4 +2763,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2913,5 +2916,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "" @@ -2999,4 +3002,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3009,4 +3013,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "" @@ -3394,27 +3399,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3424,5 +3429,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3515,5 +3520,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3521,5 +3526,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4176,5 +4181,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Επεξεργασία" @@ -5044,5 +5049,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "" @@ -5424,5 +5429,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5578,5 +5583,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7318,5 +7323,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7488,5 +7493,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" -msgstr "" +msgstr "Αντιστροφή" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 @@ -7525,21 +7530,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7548,5 +7560,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7555,47 +7567,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Λήψη μελών" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7604,25 +7616,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8062,5 +8074,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8069,19 +8081,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8091,33 +8103,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -9382,5 +9394,5 @@ "
If you want to upload traces, look here:" msgstr "" -"Η αποστολή μη επεξεργασμένων δεδομένων GPS ως δεδομένα χάρτη θερείτε " +"Η αποστολή μη επεξεργασμένων δεδομένων GPS ως δεδομένα χάρτη θεωρείτε " "βλαβερή.
Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:" @@ -10201,5 +10213,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54 msgid "Password: " -msgstr "" +msgstr "Κωδικός: " #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:175 @@ -10686,5 +10698,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Παρακαλώ επιλέξτε την γραμμή για επεξεργασία." @@ -10698,5 +10710,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -11786,5 +11798,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67 msgid "OSM password:" -msgstr "" +msgstr "OSM κωδικός:" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88 @@ -11907,5 +11919,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:144 msgid "Password:" -msgstr "" +msgstr "Κωδικός:" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230 @@ -12357,5 +12369,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -13339,5 +13351,5 @@ #, java-format msgid "According to the information within the plugin, the author is {0}." -msgstr "Σώμφωνα με τις πληροφορίες του πρόσθετου, ο συγγραφέας είναι{0}." +msgstr "Σώμφωνα με τις πληροφορίες του πρόσθετου, ο συγγραφέας είναι ο {0}." #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:769 @@ -13470,5 +13482,5 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60 msgid "Report Bug" -msgstr "Αναφέρετε Bug" +msgstr "Αναφορά σφάλματος" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64 @@ -14206,5 +14218,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32 msgid "Reverse grey colors (for black backgrounds)." -msgstr "Αντιστορή γκρι χρωμάτων (για μαύρο φόντο)." +msgstr "Αντιστροφή γκρι χρωμάτων (για μαύρο φόντο)." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34 @@ -14684,5 +14696,5 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 msgid "Split area" -msgstr "" +msgstr "Διαίρεση περιοχής" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 @@ -14696,4 +14708,7 @@ "Remove the area from the relation before splitting it." msgstr "" +"Η επιλεγμένη διαδρομή δεν μπορεί να διαιρεθεί, γιατί είναι μέλος κάποιας " +"σχέσης.\n" +"Αφαιρέστε την περιοχή από την σχέση πριν τη διαιρέσετε." #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38 @@ -15959,5 +15974,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:141 msgid "Reverse route" -msgstr "Αναστροφή διαδρομής" +msgstr "Αναστροφή δρομολογίου" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154 @@ -16571,28 +16586,14 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Πρόκειτε να διαγράψετε κόμβους εκτός της περιοχής που λάβατε.
Αυτό " -"μπορεί να δημιουργήσει προβλήματα γιατί άλλα αντικείμενα (που δεν βλέπετε) " -"μπορεί να τους χρησιμοποιούν.
Είστε σίγουροι οτι επιθυμείτε διαγραφή;" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -16745,23 +16746,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Ελεγκτής ιδιοτήτων:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16772,7 +16773,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "" @@ -16780,80 +16781,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Το κλειδί \"{0}\" δεν είναι έγκυρο." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Ετικέτες χωρίς τιμές" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Το κλειδί \"{0}\" δεν υπάρχει στις προεπιλογές" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Η τιμή \"{0}\" για το κλειδί \"{1}\" δεν υπάρχει στις προεπιλογές." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Έλεγχος τιμών ιδιοτήτων." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -16861,75 +16862,79 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Προσθήκη νέας πηγής στην λίστα." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "Επιξεργασία της επιλεγμένης πηγής." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Διαγραφή της επιλεγμένης πηγής από την λίστα." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Πηγές δεδομένων" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Έλεγχος τιμών ιδιοτήτων." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Έλεγχος για FIXMES." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "Χρήση του προεπιλεγμένου αρχείου ορθογραφικού ελέγχου (προτείνεται)" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Διόρθωση ιδιοτήτων" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "Δεν βρέθηκε ο τύπος του στοιχείου" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -18294,5 +18299,5 @@ #: build/trans_presets.java:202 msgid "Tertiary" -msgstr "" +msgstr "Τριτεύων" #. item "Highways/Streets/Tertiary" @@ -18302,5 +18307,5 @@ #: build/trans_presets.java:206 msgid "Edit Tertiary Road" -msgstr "" +msgstr "Επεξεργασία Τριτεύωντος Δρόμου" #. item "Highways/Streets/Tertiary" check "Embankment" @@ -18681,5 +18686,5 @@ #: build/trans_presets.java:350 msgid "Road Restrictions" -msgstr "" +msgstr "Περιορισμοί Δρόμου" #. item "Highways/Streets/Road Restrictions" @@ -18688,5 +18693,5 @@ #: build/trans_presets.java:353 msgid "Edit Road Restrictions" -msgstr "" +msgstr "Επεξεργασία Περιορισμών Δρόμου" #. item "Highways/Streets/Road Restrictions" check "Oneway" @@ -19120,5 +19125,5 @@ #: build/trans_presets.java:383 build/trans_style.java:617 msgid "tertiary" -msgstr "" +msgstr "τριτεύων" #: build/trans_presets.java:383 @@ -19787,5 +19792,5 @@ #: build/trans_presets.java:730 msgid "Mountain Pass" -msgstr "" +msgstr "Ορεινό πέρασμα" #. item "Waypoints/Mountain Pass" @@ -19793,5 +19798,5 @@ #: build/trans_presets.java:732 msgid "Edit Mountain Pass" -msgstr "" +msgstr "Επεξεργασία ορεινού Περάσματος" #. item "Waypoints/Mountain Pass" text "Name" @@ -20106,5 +20111,5 @@ #: build/trans_presets.java:950 msgid "Drain" -msgstr "" +msgstr "Αποχέτευση" #. item "Water/Water/Drain" @@ -20112,10 +20117,10 @@ #: build/trans_presets.java:952 msgid "Edit Drain" -msgstr "" +msgstr "Επεξεργασία Αποχέτευσης" #. item "Water/Water/Drain" combo "Layer" #: build/trans_presets.java:958 msgid "Ditch" -msgstr "" +msgstr "Χαντάκι" #. item "Water/Water/Ditch" @@ -20123,5 +20128,5 @@ #: build/trans_presets.java:960 msgid "Edit Ditch" -msgstr "" +msgstr "Επεξεργασία Χαντακιού" #. item "Water/Water/Ditch" combo "Layer" @@ -30121,5 +30126,5 @@ #: build/trans_validator.java:46 msgid "wrong highway tag on a node" -msgstr "λάθος ετικέτ αυτοκινητοδρόμου σε κόμβο" +msgstr "λάθος ετικέτα αυτοκινητοδρόμου σε κόμβο" #. node : W : highway == track @@ -30331,4 +30336,14 @@ msgid "Sicily - Italy" msgstr "" + +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Πρόκειτε να διαγράψετε κόμβους εκτός της περιοχής που λάβατε.
Αυτό " +#~ "μπορεί να δημιουργήσει προβλήματα γιατί άλλα αντικείμενα (που δεν " +#~ "βλέπετε) μπορεί να τους χρησιμοποιούν.
Είστε σίγουροι οτι επιθυμείτε " +#~ "διαγραφή;" #~ msgid "Do not show again" Index: applications/editors/josm/i18n/po/en_GB.po =================================================================== --- applications/editors/josm/i18n/po/en_GB.po (revision 20158) +++ applications/editors/josm/i18n/po/en_GB.po (revision 20175) @@ -11,5 +11,5 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" "PO-Revision-Date: 2010-02-21 10:08+0000\n" "Last-Translator: bastik \n" @@ -19,5 +19,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:32+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -74,6 +74,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -251,5 +252,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -397,5 +398,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -489,6 +490,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -707,5 +708,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -823,5 +824,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Duplicate" @@ -2487,45 +2488,37 @@ "move zoom with right button" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2836,4 +2829,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2992,5 +2990,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "Double conflict" @@ -3081,4 +3079,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3091,4 +3090,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "Delete confirmation" @@ -3507,27 +3507,27 @@ "error, it should be safe to continue in your work." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "Missing merge target for way with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "Missing merge target for node with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Missing merge target for object with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "Missing merge target for relation with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3537,5 +3537,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3633,5 +3633,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3641,5 +3641,5 @@ "other is not" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4312,5 +4312,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Edit" @@ -5222,5 +5222,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "Apply" @@ -5624,5 +5624,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5778,5 +5778,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "Create a copy of this relation and open it in another editor window" @@ -7558,5 +7558,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7785,21 +7785,28 @@ msgstr "Delete the currently edited relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "Yes, create a conflict and close" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "Click to create a conflict and close this relation editor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "No, continue editing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "Click to return to the relation editor and to resume relation editing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7811,5 +7818,5 @@ "conflict and close the editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7820,47 +7827,47 @@ "
Please resolve this conflict first, then try again." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "Apply the current updates" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "Apply the updates and close the dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "Cancel the updates and close the dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "Add an empty tag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "Download all incomplete members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "Relation Editor: Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "Download selected incomplete members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "Sets a role for the selected members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "Apply Role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7869,25 +7876,25 @@ msgstr[1] "You are setting an empty role on {0} primitives." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "This is equal to deleting the roles of these primitives." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "Do you really want to apply the new role?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "Yes, apply it" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "No, do not apply" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "Confirm empty role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "Edit the relation the currently selected relation member refers to" @@ -8346,5 +8353,5 @@ "p>" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8355,19 +8362,19 @@ "network problem, please check
your internet connection" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "Failed to open URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "Open the current help page in an external browser" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "Edit the current help page" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8379,33 +8386,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "Reload the current help page" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "Go to the previous page" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "Go to the next page" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "Go to the JOSM help home page" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "Warning: bad location in HTML document. Exception was: {0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "Failed to open help page. The target URL is empty." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "Failed to open help page" @@ -11173,5 +11180,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Please select the row to edit." @@ -11185,5 +11192,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12919,5 +12926,5 @@ msgstr "Failed to open input stream for resource ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -17322,28 +17329,14 @@ msgstr "Crossing ways" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Duplicated nodes" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "This test checks that there are no nodes at the very same location." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects, that you don't see, might " -"be using them.
Do you really want to delete?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "Confirmation" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "Nodes at same position" @@ -17505,23 +17498,23 @@ "This test checks for ways with similar names that may have been misspelt." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Properties checker :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "This plugin checks for errors in property keys and values." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Invalid tagchecker line - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Invalid spellcheck line: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -17532,7 +17525,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "Illegal tag/value combinations" @@ -17540,80 +17533,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "Painting problem" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Key ''{0}'' invalid." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Tags with empty values" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "Invalid property key" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "Invalid white space in property key" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "Property values start or end with white space" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "Property values contain HTML entity" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Key ''{0}'' not in presets." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "Presets do not contain property key" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Value ''{0}'' for key ''{1}'' not in presets." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "Presets do not contain property value" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Check property keys." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "Validate that property keys are valid checking against list of words." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "Use complex property checker." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "Validate property values and tags using complex rules." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "TagChecker source" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -17623,75 +17616,79 @@ "org/index.php/User:JLS/speller) or tag checking data files." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Add a new source to the list." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "Edit the selected source." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Delete the selected source from the list." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Data sources" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Check property values." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "Validate that property values are valid checking against presets." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Check for FIXMES." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Looks for nodes or ways with FIXME in any property value." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "Check for paint notes." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "Check if map painting found data errors." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Use default data file." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Use the default data file (recommended)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "Use default tag ignore file." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "Use the default tag ignore file (recommended)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Use default spellcheck file." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "Use the default spellcheck file (recommended)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Fix properties" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "Could not find element type" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -31157,4 +31154,16 @@ msgstr "Sicily - Italy" +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects, that you don't see, " +#~ "might be using them.
Do you really want to delete?" + +#~ msgid "Confirmation" +#~ msgstr "Confirmation" + #~ msgid "Move" #~ msgstr "Move" Index: applications/editors/josm/i18n/po/es.po =================================================================== --- applications/editors/josm/i18n/po/es.po (revision 20158) +++ applications/editors/josm/i18n/po/es.po (revision 20175) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" "PO-Revision-Date: 2010-02-14 23:28+0000\n" "Last-Translator: bastik \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:27+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,6 +71,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -251,5 +252,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -396,5 +397,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -488,6 +489,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -706,5 +707,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -825,5 +826,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Duplicar" @@ -2504,45 +2505,37 @@ "abajo, derecha; mover el zoom con el botón derecho" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2865,4 +2858,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -3022,5 +3020,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "Doble conflicto" @@ -3113,4 +3111,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3123,4 +3122,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "Confirmación antes de borrar" @@ -3546,27 +3546,27 @@ "no es un error crítico, puede continuar con su trabajo de manera segura." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "Falta de combinación de destino para la direccion con el ID {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "Falta de combinación de destino para el nodo con el ID {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Falta de combinación de destino para el objeto con el ID {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "Falta de combinación de destino para la relación con el ID {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3576,5 +3576,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3667,5 +3667,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3673,5 +3673,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4346,5 +4346,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Editar" @@ -5272,5 +5272,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "Aplicar" @@ -5668,5 +5668,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5823,5 +5823,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "Crear una copia de esta relación y abrirla en otra ventana de edición." @@ -7595,5 +7595,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7815,21 +7815,28 @@ msgstr "Eliminar esta relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "Sí, crear un conflicto y cerrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "No, continuar editando" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7838,5 +7845,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7847,47 +7854,47 @@ "necesario resolver el conflicto antes de continuar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "Aplicar las actualizaciones actuales" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "Aplicar las actualizaciones y cerrar el diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "Cancelar las actualizaciones y cerrar el cuadro de diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "Añadir una etiqueta vacía" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "Descargar todos los miembros incompletos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Descargar miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "Descargar los miembros incompletos seleccionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "Fijar una función para los miembros seleccionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "Aplicar función" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7896,25 +7903,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "Sí, aplícalo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "No, no lo apliques" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "Confirmar función vacía" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8361,5 +8368,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8368,19 +8375,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8390,33 +8397,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "Ir a la página anterior" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "Ir a la página siguiente" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "Ir a la página de ayuda de JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "Fallo al abrir la página de ayuda" @@ -11054,5 +11061,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Por favor, seleccione la fila a editar" @@ -11066,5 +11073,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12769,5 +12776,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -17107,28 +17114,14 @@ msgstr "Cruce de vías" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Nodos duplicados" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "Esta examen comprueba que no haya nodos en el mismo lugar." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Está a punto de borrar nodos fuera del área que se ha descargado.
Esto " -"puede causar problemas ya que otros objetos (que no puede ver) pueden estar " -"usándolos.
¿Esta seguro que quiere borrarlo?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "Confirmación" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "Nodos en la misma posición" @@ -17293,9 +17286,9 @@ "escrito mal." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Comprobación de propiedades:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "" @@ -17303,15 +17296,15 @@ "valores." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Línea de test de etiquetas no válida - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Línea de correción ortográfica no válida: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -17322,7 +17315,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "Combinaciones incorrectas de etiquetas y/o valores" @@ -17330,61 +17323,61 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "Problema al dibujar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Clave ''{0}'' no válida." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Etiquetas con valores vacíos" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "Clave de propiedad no válida" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "Espacio en blanco no válido en la clave de propiedad" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "" "Los valores de la propiedad empiezan y terminan con un espacio en blanco" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "Los valores de propiedad contienen entidad de HTML" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "La clave ''{0}\" no existe en los predefinidos" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "Esta clave no está predefinida" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "El valor \"{0}\" para la clave \"{1}\" no está en los predefinidos." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "Los predefinidos no contiene valores apropiados" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Comprobar las propiedades de las claves" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" @@ -17392,21 +17385,21 @@ "comprobación de las palabras." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "Usar analizador de propiedad compleja." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "Validar valores de propiedad y etiquetas que usan reglas complejas" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "Fuente de test de etiquetas" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -17417,25 +17410,25 @@ "del corrector de etiquetas." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Agregar nueva fuente a la lista." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "Editar la fuente seleccionada." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Borrar la fuente seleccionada de la lista." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Fuentes de datos" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Analizar propiedades de los valores." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" @@ -17443,51 +17436,55 @@ "los predefinidos." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Comprobar FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Buscar nodos o viales con FIXME en cualquier propiedad de valor" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "Compruebar el registro de notas." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "Analizar si el mapa creado contiene errores en los datos." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Usar datos de archivo por defecto." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Usar datos de archivo por defecto (recomendado)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "Ignorar el uso de etiquetas de archivos por defecto." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "Utilizar etiquetas de archivos por defecto (recomendado)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Utilizar el corrector ortográfico por defecto." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "Utilizar el corrector ortográfico por defecto (recomendado)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Fijar las propiedades" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "No se pudo encontrar el tipo de elemento" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -30991,4 +30988,16 @@ msgstr "Sicilia - Italia" +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Está a punto de borrar nodos fuera del área que se ha descargado.
Esto " +#~ "puede causar problemas ya que otros objetos (que no puede ver) pueden " +#~ "estar usándolos.
¿Esta seguro que quiere borrarlo?" + +#~ msgid "Confirmation" +#~ msgstr "Confirmación" + #~ msgid "Move" #~ msgstr "Mover" Index: applications/editors/josm/i18n/po/et.po =================================================================== --- applications/editors/josm/i18n/po/et.po (revision 20158) +++ applications/editors/josm/i18n/po/et.po (revision 20175) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-21 10:44+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-24 21:25+0000\n" "Last-Translator: Margus Värton \n" "Language-Team: Estonian \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:32+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,6 +71,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -244,5 +245,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -388,5 +389,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -480,6 +481,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -696,5 +697,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -812,5 +813,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Kahekordista" @@ -2435,45 +2436,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2764,4 +2757,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2912,5 +2910,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "" @@ -2998,4 +2996,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3005,4 +3004,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "" @@ -3390,27 +3390,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3420,5 +3420,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3511,5 +3511,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3517,5 +3517,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4176,5 +4176,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Muuda" @@ -5041,5 +5041,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "" @@ -5420,5 +5420,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5574,5 +5574,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7311,5 +7311,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7518,21 +7518,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7541,5 +7548,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7548,47 +7555,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "Rakenda jooksvad uuendused" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Lae alla liikmed" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7597,25 +7604,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8051,5 +8058,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8058,19 +8065,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8080,33 +8087,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -10661,5 +10668,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "PAlun vali rida muutmiseks" @@ -10673,5 +10680,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12323,5 +12330,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16503,25 +16510,14 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -16674,23 +16670,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16699,7 +16695,7 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "" @@ -16707,80 +16703,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -16788,74 +16784,78 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" msgstr "" Index: applications/editors/josm/i18n/po/fi.po =================================================================== --- applications/editors/josm/i18n/po/fi.po (revision 20158) +++ applications/editors/josm/i18n/po/fi.po (revision 20175) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-23 13:04+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-25 15:00+0000\n" "Last-Translator: Teemu Koskinen \n" "Language-Team: Finnish \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:28+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,6 +71,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -244,5 +245,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -390,5 +391,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -482,6 +483,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -697,5 +698,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -813,5 +814,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Monista" @@ -2460,45 +2461,37 @@ "Siirrä aluetta Ctrl+nuolinäppäimillä tai raahaa hiiren oikealla napilla." -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2808,4 +2801,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2956,5 +2954,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "" @@ -3042,4 +3040,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3052,4 +3051,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "Poiston vahvistus" @@ -3439,27 +3439,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3469,5 +3469,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3560,5 +3560,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3566,5 +3566,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4221,5 +4221,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Muokkaa" @@ -5086,5 +5086,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "" @@ -5465,5 +5465,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5619,5 +5619,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "Luo kopio tästä relaatiosta ja avaa se toiseen ikkunaan" @@ -5629,5 +5629,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:454 msgid "Select the members of all selected relations" -msgstr "" +msgstr "Valitse kaikkien valittujen relaatioiden jäsenet" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:456 @@ -5710,10 +5710,10 @@ msgid "{0} Author" msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} tekijä" +msgstr[1] "{0} tekijää" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:150 msgid "Select primitives submitted by this user" -msgstr "" +msgstr "Valitse tämän käyttäjänä lähettämät objektit" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 @@ -5740,5 +5740,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:268 msgid "" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:281 @@ -5760,5 +5760,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:182 msgid "Content" -msgstr "" +msgstr "Sisältö" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:183 @@ -5783,5 +5783,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:265 msgid "Remove from cache" -msgstr "" +msgstr "Poista välimuistista" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:383 @@ -5946,5 +5946,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:370 msgid "Nothing to select" -msgstr "" +msgstr "Ei mitään valittavaa" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:377 @@ -7360,5 +7360,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7567,21 +7567,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7590,5 +7597,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7597,47 +7604,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "Tee muutokset" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "Tee muutokset ja sulje tämä ikkuna" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "Peruuta muutokset ja sulje tämä ikkuna" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "Lataa kaikki keskeneräiset jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Lataa jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "Lataa valitut keskeneräiset jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "Aseta rooli valituille jäsenille" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "Aseta rooli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7646,25 +7653,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8102,5 +8109,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8109,19 +8116,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8131,33 +8138,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -10755,5 +10762,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Ole hyvä ja valitse muokattava rivi." @@ -10767,5 +10774,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12431,5 +12438,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16638,28 +16645,14 @@ msgstr "Risteävät polut" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Päällekkäiset pisteet" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Olet aikeissa poistaa pisteitä ladatun alueen ulkopuolelta.
Tämä voi " -"johtaa ongelmiin, koska objektit, joita et näe voivat käyttää niitä." -"
Oletko varma, että haluat poistaa ne?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -16817,23 +16810,23 @@ "Etsii keskenään lähes samannimisiä polkuja; mahdollisesti kirjoitusvirheitä." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Ominaisuustarkistin:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "Etsii virheellisiä avain/arvo-pareja." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Epäkelpo tagin tarkistussääntö - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Epäkelpo oikeinkirjoituksen tarkistussääntö: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16844,7 +16837,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "Virheelliset avain/arvo-parit" @@ -16852,81 +16845,81 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "Piirto-ongelma" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Avain \"{0}\" virheellinen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Tyhjät arvot" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "Epäkelpo avain" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "Virheellinen välilyönti avaimessa" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "Arvossa välilyönti alussa tai lopussa" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "Avaimen arvossa HTML-entiteettikoodeja" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "FIXME-avain (korjattavia karttakohteita)" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Tarkista ominaisuuksien avaimet" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" "Tarkista ominaisuuksien avaimet vertaamalla tunnettujen avainten listaan." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -16937,76 +16930,80 @@ "php/User:JLS/speller )" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Lisää tiedosto" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Poista valittu lähde listasta." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Oikeinkirjoitus- ja ominaisuustarkistimen sääntötiedostot" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Tarkista ominaisuuksien arvot." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" "Tarkista ominaisuuksien arvot vertaamalla esivalintojen tuntemiin arvoihin." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Etsi FIXME:t" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Etsii pisteet ja polut joilla on FIXME-tagi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "Tarkista muokkausnäkymän piirto-ongelmat" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Käytä oletussääntötiedostoa." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Käytä tarkistimen mukana tullutta sääntötiedostoa (suositus)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Käytä oletusoikeinkirjoitussääntöjä." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "" "Käytä tarkistimen mukana tullutta oikeinkirjoitussääntötiedostoa (suositus)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" msgstr "" @@ -30409,4 +30406,13 @@ msgstr "Sicily - Italy" +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Olet aikeissa poistaa pisteitä ladatun alueen ulkopuolelta.
Tämä voi " +#~ "johtaa ongelmiin, koska objektit, joita et näe voivat käyttää niitä." +#~ "
Oletko varma, että haluat poistaa ne?" + #~ msgid "Unknown version" #~ msgstr "Tuntematon versio" Index: applications/editors/josm/i18n/po/fr.po =================================================================== --- applications/editors/josm/i18n/po/fr.po (revision 20158) +++ applications/editors/josm/i18n/po/fr.po (revision 20175) @@ -6,6 +6,6 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-23 16:47+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-26 16:55+0000\n" "Last-Translator: Tbj \n" "Language-Team: Fr <>\n" @@ -14,5 +14,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:28+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Language: French\n" @@ -70,6 +70,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -251,5 +252,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -398,5 +399,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -490,6 +491,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -709,5 +710,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -828,5 +829,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Dupliquer" @@ -1725,5 +1726,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:88 msgid "Delete nodes outside of data regions?" -msgstr "" +msgstr "Supprimer les noeuds situés en dehors des régions de données?" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:101 @@ -2540,45 +2541,37 @@ "droit de la souris" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "<égal>" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2700,4 +2693,6 @@ "assigned version)" msgstr "" +"version:... - objet avec la version donnée (0 objets n'ayant pas de " +"version attribuée)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 @@ -2714,4 +2709,6 @@ "min-max)" msgstr "" +"nodes:... - objet avec un nombre donné de nœuds (nodes:nombre ou " +"nodes:min-max)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 @@ -2720,4 +2717,6 @@ "max)" msgstr "" +"tags:... - objet avec un nombre donné de balises (tags:nombre ou tags:" +"min-max)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 @@ -2766,4 +2765,6 @@ msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" +"Utilisez \" pour encadrer les opérateurs (par exemple s'ils " +"contiennent :)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:144 @@ -2897,4 +2898,10 @@ msgstr "Identifiant de primitive attendu" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +#, fuzzy +msgid "Range of numbers expected" +msgstr "Identifiant de groupe de modifications attendu" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -3052,5 +3059,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "Double conflit" @@ -3142,4 +3149,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3152,4 +3160,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "Confirmation de suppression" @@ -3476,4 +3485,6 @@ msgid "Failed to load resource ''{0}'', error is {1}." msgstr "" +"La ressource \"{0}\" n'a pas pu être chargée, à cause de l'erreur suivante : " +"{1}" #: ../core/src/org/openstreetmap/josm/data/Version.java:98 @@ -3551,27 +3562,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3581,5 +3592,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3658,10 +3669,10 @@ #, java-format msgid "ID > 0 expected. Got {0}." -msgstr "" +msgstr "Un ID > 0 était attendu. Là, il valait {0}." #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "Version > 0 expected. Got {0}." -msgstr "" +msgstr "Un numéro de version > 0 était attendu. Là, il valait {0}." #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:650 @@ -3671,6 +3682,8 @@ "{0}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +"Impossible d'attribuer un Id de groupe de modifications positif à une " +"nouvelle primitive. La valeur de l'Id u groupe de modification est {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3678,5 +3691,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4352,5 +4365,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Édition" @@ -4629,6 +4642,6 @@ msgid "Tags({0} conflict)" msgid_plural "Tags({0} conflicts)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Balises ({0} conflit)" +msgstr[1] "Balises ({0} conflits)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 @@ -4636,6 +4649,6 @@ msgid "{0} pending tag conflict to be resolved" msgid_plural "{0} pending tag conflicts to be resolved" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} conflit sur balises en attente d'être résolus" +msgstr[1] "{0} conflits sur balises en attente d'être résolus" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 @@ -4697,5 +4710,5 @@ #, java-format msgid "{0} more..." -msgstr "" +msgstr "{0} suivants..." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 @@ -5240,4 +5253,5 @@ msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" +"Conflits lors de la combinaison de voies - la voie combinée est ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:140 @@ -5245,4 +5259,5 @@ msgid "Conflicts when merging nodes - target node is ''{0}''" msgstr "" +"La fusion des nœuds occasionne des conflits -le nœud destination est \"{0}\"" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:282 @@ -5263,5 +5278,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "Appliquer" @@ -5374,4 +5389,6 @@ msgid "Position {0} is out of range. Current number of members is {1}." msgstr "" +"La position {0} est hors de la zone de valeurs admises. Le nombre actuel de " +"membres est de {1}." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:29 @@ -5421,4 +5438,5 @@ msgid "Enter a tag key, i.e. fixme" msgstr "" +"Entrer un nom d'étquette, c.à.d. fixme" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 @@ -5430,4 +5448,6 @@ "Enter a tag value, i.e. check members" msgstr "" +"Entrer une valeur de balise, c.à.d. check members" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123 @@ -5512,4 +5532,6 @@ msgid "Download information about the selected changesets from the OSM server" msgstr "" +"Télécharger, depuis le serveur OSM, des informations à propos des groupes de " +"modifications sélectionnés" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:395 @@ -5651,5 +5673,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5805,5 +5827,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5813,5 +5835,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 msgid "Set the current selection to the list of selected relations" -msgstr "" +msgstr "Faire de la liste des relations sélectionnées, la sélection en cours" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:454 @@ -5949,5 +5971,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:182 msgid "Content" -msgstr "" +msgstr "Contenu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:183 @@ -6083,10 +6105,10 @@ #, java-format msgid "({0}/{1}) Downloading changeset {2}..." -msgstr "" +msgstr "({0}/{1}) Téléchargement du groupe de modifications {2} en cours..." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:177 #, java-format msgid "({0}/{1}) Downloading content for changeset {2}..." -msgstr "" +msgstr "({0}/{1}) Téléchargement du contenu du groupe de modifications {2}..." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:176 @@ -7080,5 +7102,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325 msgid "Update the changeset from the OSM server" -msgstr "" +msgstr "Mettre à jour le groupe de modifications depuis le serveur OSM" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:358 @@ -7162,4 +7184,6 @@ "Select changesets based on the date/time they have been created or closed" msgstr "" +"Sélectionner les groupes de modification d'après leur date et heure de " +"création ou d'enregistrement" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132 @@ -7196,4 +7220,5 @@ msgid "Only changesets owned by the user with the following user ID" msgstr "" +"Seulement les groupes de modifications de l'utilisateur ayant l'ID suivant" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475 @@ -7263,4 +7288,6 @@ msgid "Only changesets closed after and created before a specific date/time" msgstr "" +"Seulement les groupes de modifications fermés après ou créés avant une date " +"et heure donnée" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837 @@ -7368,5 +7395,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128 msgid "Advanced" -msgstr "" +msgstr "Expert" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58 @@ -7408,5 +7435,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:164 msgid "Query and download changesets ..." -msgstr "" +msgstr "Lancer des requêtes et télécharger des groupes de modifications" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42 @@ -7417,4 +7444,6 @@ msgid "Please enter or paste an URL to retrieve changesets from the OSM API." msgstr "" +"Merci de taper ou de coller une URL pour récupérer des groupes de " +"modifications depuis l'API OSM." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71 @@ -7586,5 +7615,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7634,5 +7663,5 @@ #, java-format msgid "({0}/{1}): Downloading relation ''{2}''..." -msgstr "" +msgstr "({0}/{1}) : téléchargement de la relation ''{2}'' en cours..." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 @@ -7772,5 +7801,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" -msgstr "" +msgstr "Inverser" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 @@ -7809,17 +7838,24 @@ msgstr "Supprimer la relation actuellement éditée." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "Oui, créer un conflit et fermer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "Cliquer pour créer un conflit et fermer cet éditeur de relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "Non, continuer à éditer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" @@ -7827,5 +7863,5 @@ "relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7834,5 +7870,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7841,47 +7877,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "Appliquer les mises-à-jour suivantes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "Appliquer les changements et fermer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "Annuler les changements et fermer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "Ajouter un attribut vide" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "Télécharger tous les membres incomplets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "Éditeur de relation : télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "Télécharger la sélection de membres incomplets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "Définir un rôle pour les membres sélectionnés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "Appliquer le rôle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7890,25 +7926,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "Èquivalent à suppimer les rôles de ces primitives." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "Voulez-vous vraiment appliquer le nouveau rôle?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "Oui, l’appliquer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "Non, ne pas l’appliquer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "Confirmer le rôle vide" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "éditer la relation en référence du membre de relation sélectionné" @@ -8026,4 +8062,6 @@ "maxlat): " msgstr "" +"Zone à télécharger actuelle (minlon, minlat, maxlon, " +"maxlat) : " #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183 @@ -8370,5 +8408,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8377,19 +8415,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "Impossible d’ouvrir l’URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" -msgstr "" +msgstr "Ouvrir la présente page d'aide dans un navigateur externe" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "Éditer la page d'aide actuelle" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8399,33 +8437,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "Recharger la page actuelle" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "Aller à la page précédante" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "Aller à la page suivante" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "Se rendre à la page d'aide de la page d'accueil de JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "Impossible d’ouvrir la page d’aide. L’URL cible est vide." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "Impossible d’ouvrir la page d’aide." @@ -8506,15 +8544,15 @@ #, java-format msgid "Loading history for node {0}" -msgstr "" +msgstr "Chargement de l''historique pour le nœud {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:187 #, java-format msgid "Loading history for way {0}" -msgstr "" +msgstr "Chargement de l''historique pour le chemin {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188 #, java-format msgid "Loading history for relation {0}" -msgstr "" +msgstr "Chargement de l''historique pour la relation {0}" #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 @@ -8859,4 +8897,6 @@ "and a valid password." msgstr "" +"L'identification auprès de l'API OSM ''{0}'' a échoué. Merci de saisir un " +"identifiant et un mot de passe valides." #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 @@ -8867,8 +8907,12 @@ msgid "Please enter the user name for authenticating at your proxy server" msgstr "" +"Saisissez votre nom d'utilisateur pour vous identifier auprès de votre " +"serveur proxy" #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255 msgid "Please enter the password for authenticating at your proxy server" msgstr "" +"Saisissez votre mot de passe pour vous identifier auprès de votre serveur " +"proxy" #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257 @@ -9072,4 +9116,6 @@ msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" +"Supprimer les calques sans enregistrer. Les modifications non sauvegardées " +"seront perdues." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -9240,5 +9286,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360 msgid "Upload the changed primitives" -msgstr "" +msgstr "Envoyer les primitives modifiées" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:366 @@ -9282,5 +9328,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 msgid "Preparing primitives to upload ..." -msgstr "" +msgstr "Préparation de l'envoi des primitives..." #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 @@ -9305,5 +9351,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58 msgid "configure changeset" -msgstr "" +msgstr "configurer le groupe de modifications" #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80 @@ -9404,6 +9450,6 @@ msgid "There is {0} object left to upload." msgid_plural "There are {0} objects left to upload." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Il reste {0} objet à envoyer au serveur." +msgstr[1] "Il reste {0} objets à envoyer au serveur." #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:113 @@ -9457,4 +9503,6 @@ "server." msgstr "" +"Marquer les objets supprimés localement comme étant à " +"supprimer sur le serveur." #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:112 @@ -9932,6 +9980,6 @@ msgid "track" msgid_plural "tracks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "trace" +msgstr[1] "traces" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162 @@ -10077,5 +10125,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533 msgid "Show Thumbnail images on the map" -msgstr "" +msgstr "Afficher les vignettes sur la carte" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558 @@ -10122,5 +10170,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717 msgid "No images could be matched!" -msgstr "" +msgstr "Aucune image ne correspond !" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866 @@ -10143,6 +10191,6 @@ msgid "(Time difference of {0} day)" msgid_plural "Time difference of {0} days" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "(Différence de {0} jour)" +msgstr[1] "(Différence de {0} jours)" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913 @@ -10570,5 +10618,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:61 msgid "Semi-automatic" -msgstr "" +msgstr "Semi-automatique" #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:64 @@ -10681,5 +10729,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 msgid "Authorize JOSM to access the OSM API" -msgstr "" +msgstr "Autoriser JOSM à accéder à l'API OSM" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:456 @@ -10826,5 +10874,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487 msgid "Initializing a session at the OSM website..." -msgstr "" +msgstr "Démarrage d'une session sur le site OSM..." #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493 @@ -10841,13 +10889,14 @@ #, java-format msgid "Logging out session ''{0}''..." -msgstr "" +msgstr "Fermeture de la session \"{0}\"..." #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37 msgid "Allow to upload map data" -msgstr "" +msgstr "Autoriser l'envoi des données de la carte" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38 msgid "Select to grant JOSM the right to upload map data on your behalf" msgstr "" +"Cocher pour autoriser JOSM à envoyer les données de la carte en votre nom" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45 @@ -11095,5 +11144,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Veuille sélectionnez la rangée à éditer." @@ -11107,5 +11156,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -11950,5 +11999,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72 msgid "Configure whether to use a proxy server" -msgstr "" +msgstr "Configurer si vous souhaitez utiliser un serveur proxy" #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73 @@ -12814,5 +12863,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -13439,10 +13488,10 @@ #, java-format msgid "Reading changeset {0} ..." -msgstr "" +msgstr "Lecture de l''ensemble de changement {0}…" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:100 #, java-format msgid "Downloading changeset {0} ..." -msgstr "" +msgstr "Téléchargement de l''ensemble de changement {0}…" #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:130 @@ -14430,9 +14479,9 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25 msgid "Handy Address Interpolation Functions" -msgstr "" +msgstr "Fonctions pratiques d'interpolation d'adresse" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 msgid "Define Address Interpolation" -msgstr "" +msgstr "Définir l'interpolation d'adresse" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107 @@ -17158,29 +17207,15 @@ msgstr "Chemins se croisant" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Nœuds dupliqués" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "" "Ce test vérifie si des nœuds ne sont pas exactement à la même position." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Vous êtes sur le point de supprimer des nœuds en dehors de la zone " -"téléchargée.
Cela peut poser problème car d’autres objets (que vous ne " -"voyez pas) pourraient les utiliser.
Voulez-vous vraiment les supprimer ?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "Confirmation" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "Nœuds à la même position" @@ -17247,5 +17282,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:69 msgid "Non-Way in multipolygon." -msgstr "" +msgstr "Objet qui n'est pas une voie dans le multi-polygones" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:35 @@ -17345,23 +17380,23 @@ "mal ortographiés." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Vérificateur de propriétés :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "Ce greffon vérifie les erreurs dans les clés et les valeurs." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Ligne du vérificateur d’attributs invalide - {0} : {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Erreur d’orthographe ligne : {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -17372,7 +17407,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "Combinaisons attribut/valeur non valide" @@ -17380,43 +17415,43 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "Problème de rendu" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Clé \"{0}\" non valide." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Étiquettes avec des valeurs vides" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "Clé de propriété invalide" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "espace blanc dans une clé non valide" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "Les valeurs commencent ou finissent par un espace blanc" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "Les valeurs contiennent du code HTML" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "La clé \"{0}\" ne fait pas partie des balises prédéfinies." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "Les balises ne contiennent pas de propriété" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." @@ -17424,39 +17459,39 @@ "La valeur \"{0}\" pour la clé \"{1}\" n’est pas dans les balises prédéfinies." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "Les balises ne contiennent pas de valeur de propriété" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Vérifier les clés de propriétés." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" "Valider que les clés sont valides en comparasion avec une liste de mots?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "Utiliser un vérificateur de propriétés complexe." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" "Valider les étiquettes et les valeurs en utilisant des règles complexes." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "Source de TagChecker" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -17467,25 +17502,25 @@ "données de vérification des étiquettes." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Ajouter une nouvelle source à la liste." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "Modifier la source sélectionnée." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Supprimer la source sélectionnée de la liste." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Sources de données" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Vérifier les valeurs des propriétés" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" @@ -17493,9 +17528,9 @@ "prédéfinies." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Vérifier les FIXMES." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" @@ -17503,43 +17538,47 @@ "lequel attribut." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "Vérifier les notes de rendu." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "Vérifier si le rendu de carte a généré des erreurs." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Utiliser le fichier de données par défaut." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Utiliser le fichier de données par défaut (recommandé)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Utiliser la vérification orthographique par défaut." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "Utiliser le fichier de vérification d’orthographe (recommandé)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Corriger les propriétés" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "Impossible de trouver le type element" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -19568,5 +19607,5 @@ #: build/trans_presets.java:358 msgid "Agricultural" -msgstr "" +msgstr "Agricole" #: build/trans_presets.java:358 build/trans_presets.java:359 @@ -19977,5 +20016,5 @@ #: build/trans_presets.java:463 build/trans_presets.java:486 msgid "MTB Scale" -msgstr "" +msgstr "Échelle MTB (mountain bike / VTT)" #. item "Ways/Track" combo "MTB Scale" @@ -19983,5 +20022,5 @@ #: build/trans_presets.java:464 build/trans_presets.java:487 msgid "SAC Scale" -msgstr "" +msgstr "Échelle CAS (classification du Club Alpin Suisse)" #. item "Ways/Track" combo "SAC Scale" @@ -19994,21 +20033,21 @@ #: build/trans_presets.java:464 build/trans_presets.java:487 msgid "mountain_hiking" -msgstr "" +msgstr "randonnée en montagne" #: build/trans_presets.java:464 build/trans_presets.java:487 msgid "demanding_mountain_hiking" -msgstr "" +msgstr "randonnée en montagne exigeante" #: build/trans_presets.java:464 build/trans_presets.java:487 msgid "alpine_hiking" -msgstr "" +msgstr "randonnée alpine" #: build/trans_presets.java:464 build/trans_presets.java:487 msgid "demanding_alpine_hiking" -msgstr "" +msgstr "randonnée alpine exigeante" #: build/trans_presets.java:464 build/trans_presets.java:487 msgid "difficult_alpine_hiking" -msgstr "" +msgstr "randonnée alpine difficile" #. item "Ways/Track" text "Width (meters)" @@ -20028,9 +20067,9 @@ #: build/trans_presets.java:488 msgid "excellent" -msgstr "" +msgstr "excellent" #: build/trans_presets.java:488 msgid "good" -msgstr "" +msgstr "bon" #: build/trans_presets.java:488 build/trans_presets.java:2049 @@ -31017,4 +31056,20 @@ msgstr "Sicile - Italie" +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Vous êtes sur le point de supprimer des nœuds en dehors de la zone " +#~ "téléchargée.
Cela peut poser problème car d’autres objets (que vous " +#~ "ne voyez pas) pourraient les utiliser.
Voulez-vous vraiment les " +#~ "supprimer ?" + +#~ msgid "Confirmation" +#~ msgstr "Confirmation" + #~ msgid "Move" #~ msgstr "Déplacer" Index: applications/editors/josm/i18n/po/gl.po =================================================================== --- applications/editors/josm/i18n/po/gl.po (revision 20158) +++ applications/editors/josm/i18n/po/gl.po (revision 20175) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" "PO-Revision-Date: 2010-01-23 22:22+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:31+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,6 +71,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -242,5 +243,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -386,5 +387,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -478,6 +479,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -694,5 +695,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -811,5 +812,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Duplicar" @@ -2444,45 +2445,37 @@ "+Frecha arriba, esquerda, abaixo, dereita; mover zoom co botón dereito" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2785,4 +2778,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2933,5 +2931,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "" @@ -3019,4 +3017,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3029,4 +3028,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "" @@ -3418,27 +3418,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3448,5 +3448,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3539,5 +3539,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3545,5 +3545,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4204,5 +4204,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Edición" @@ -5072,5 +5072,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "" @@ -5452,5 +5452,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5607,5 +5607,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7347,5 +7347,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7554,21 +7554,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7577,5 +7584,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7584,47 +7591,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Descargar Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7633,25 +7640,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8091,5 +8098,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8098,19 +8105,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8120,33 +8127,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -10722,5 +10729,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Por favor selecciona a fila a editar." @@ -10734,5 +10741,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12428,5 +12435,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16614,28 +16621,14 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Estás a punto de borrar nodos que se atopan fora da área que descargaches." -"
Isto pode causar problemas porque outros obxectos (que non ves) poden " -"estar usandoos.
Queres borralos realmente?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -16788,23 +16781,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16815,7 +16808,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "" @@ -16823,80 +16816,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -16904,75 +16897,79 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Borrar da lista a fonte seleccionada." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Usar ficheiro de datos por defecto." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Usar o ficheiro de datos por defecto (recomendado)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Usar ficheiro de comprobación ortográfica predeterminado." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "" "Usar o ficheiro de comprobación ortográfica predeterminado (recomendado)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" msgstr "" @@ -30368,4 +30365,13 @@ msgstr "" +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Estás a punto de borrar nodos que se atopan fora da área que descargaches." +#~ "
Isto pode causar problemas porque outros obxectos (que non ves) poden " +#~ "estar usandoos.
Queres borralos realmente?" + #~ msgid "Do not show again" #~ msgstr "Non amosar de novo" Index: applications/editors/josm/i18n/po/he.po =================================================================== --- applications/editors/josm/i18n/po/he.po (revision 20158) +++ applications/editors/josm/i18n/po/he.po (revision 20175) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" "PO-Revision-Date: 2010-01-23 21:36+0000\n" "Last-Translator: Tsvi Mostovicz \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:30+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:56+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,6 +71,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -246,5 +247,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -390,5 +391,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -482,6 +483,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -695,5 +696,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -811,5 +812,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "שכפל" @@ -2419,45 +2420,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2753,4 +2746,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2901,5 +2899,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "" @@ -2987,4 +2985,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -2996,4 +2995,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "" @@ -3381,27 +3381,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3411,5 +3411,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3502,5 +3502,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3508,5 +3508,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4167,5 +4167,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "ערוך" @@ -5040,5 +5040,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "" @@ -5418,5 +5418,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5572,5 +5572,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7308,5 +7308,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7515,21 +7515,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7538,5 +7545,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7545,47 +7552,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "הורד חברים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7594,25 +7601,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8048,5 +8055,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8055,19 +8062,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8077,33 +8084,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -10668,5 +10675,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "נא בחר את השורה לעריכה." @@ -10680,5 +10687,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12330,5 +12337,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16518,27 +16525,14 @@ msgstr "דרכים חוצות" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "נקודות כפולות" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "מבחן זה בודק אם אין נקודות שנמצאות בדיוק באותו מקום." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"אתה עומד למחוק נקודות מחוץ לשטח שהורדת.
זה עלול לגרום לבעיות כיוון שעצמים " -"אחרים {שאתה לא רואה) עשויים להשתמש בהם.
האם אתה באמת רוצה למחוק?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -16691,23 +16685,23 @@ msgstr "מבחן זה מחפש דרכים עם שמות דומים שעלולים לנבוע משגיאות כתיב." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "בודק תכונות:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "תוסף זה מחפש שגיאות במפתחות וערכים של תכונות." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16718,7 +16712,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "צירופי תווית \\ ערך לא חוקיים" @@ -16726,80 +16720,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "בעיית ציור" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "מפתח \"{0}\" לא תקין." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "תוויות עם ערכים ריקים" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "מפתח תכונה לא תקין" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "רווח לא תקין במפתח תכונה" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "ערכי תכונות מתחילים או מסתיימים ברווח" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "בדוק מפתחות תכונות." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -16807,75 +16801,79 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "הוסף מקור חדש לרשימה" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "ערוך את המקור הנבחר" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "מחק את המקור הנבחר מהרשימה" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "מקורות נתונים" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "בדוק ערכי תכונות." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "השתמש בברירת המחדל לקובץ הנתונים (מומלץ)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "השתמש בברירת המחדל לקובץ בודק האיות" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "תקן תכונות" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "לא יכול למצוא את סוג האלמנט" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -30272,4 +30270,12 @@ msgstr "" +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "אתה עומד למחוק נקודות מחוץ לשטח שהורדת.
זה עלול לגרום לבעיות כיוון " +#~ "שעצמים אחרים {שאתה לא רואה) עשויים להשתמש בהם.
האם אתה באמת רוצה למחוק?" + #~ msgid "Move" #~ msgstr "הזז" Index: applications/editors/josm/i18n/po/is.po =================================================================== --- applications/editors/josm/i18n/po/is.po (revision 20158) +++ applications/editors/josm/i18n/po/is.po (revision 20175) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" "PO-Revision-Date: 2010-01-31 17:21+0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:31+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:56+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,6 +71,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -242,5 +243,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -387,5 +388,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -479,6 +480,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -695,5 +696,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -811,5 +812,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Tvöfalda" @@ -2421,45 +2422,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2759,4 +2752,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2907,5 +2905,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "" @@ -2993,4 +2991,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3003,4 +3002,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "" @@ -3388,27 +3388,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3418,5 +3418,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3509,5 +3509,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3515,5 +3515,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4168,5 +4168,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Breyta" @@ -5033,5 +5033,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "Vista" @@ -5411,5 +5411,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5565,5 +5565,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "Afrita þessi vensl og opna breytingarglugga fyrir afritið" @@ -7303,5 +7303,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7515,21 +7515,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7538,5 +7545,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7545,47 +7552,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "Bæta við tómu taggi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Niðurhala meðlimum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "Vistar hlutverk fyrir völd stök" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "Vista hlutverk" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7594,25 +7601,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "Breyta venslunum sem valið stak bendir á" @@ -8049,5 +8056,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8056,19 +8063,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8078,33 +8085,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -10661,5 +10668,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Veldu hlut til að breyta fyrst." @@ -10673,5 +10680,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12326,5 +12333,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16507,28 +16514,14 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Þú ert að fara eyða hnútum utan þess svæðis sem þú hefur niðurhalað." -"
Þetta getur valdið vandamálum því aðrir hlutir (sem þú sérð ekki) gætu " -"verið að nota þá.
Ertu viss um að þú viljir eyða þeim?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -16681,23 +16674,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16706,7 +16699,7 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "" @@ -16714,80 +16707,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -16795,74 +16788,78 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" msgstr "" @@ -30258,4 +30255,13 @@ msgstr "" +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Þú ert að fara eyða hnútum utan þess svæðis sem þú hefur niðurhalað." +#~ "
Þetta getur valdið vandamálum því aðrir hlutir (sem þú sérð ekki) " +#~ "gætu verið að nota þá.
Ertu viss um að þú viljir eyða þeim?" + #~ msgid "Incorrect password or username." #~ msgstr "Rangt lykilorð eða notandanafn" Index: applications/editors/josm/i18n/po/it.po =================================================================== --- applications/editors/josm/i18n/po/it.po (revision 20158) +++ applications/editors/josm/i18n/po/it.po (revision 20175) @@ -5,7 +5,7 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-23 09:35+0000\n" -"Last-Translator: Davide Prade \n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-26 06:43+0000\n" +"Last-Translator: simone \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -13,5 +13,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:28+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:55+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -68,6 +68,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -248,5 +249,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -397,5 +398,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -489,6 +490,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -708,5 +709,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -828,5 +829,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Duplica" @@ -2539,45 +2540,37 @@ "di ingrandimento con il tasto destro" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "oppure" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "intervallo" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2839,5 +2832,5 @@ msgctxt "search" msgid "CS" -msgstr "" +msgstr "CS" #. case insensitive @@ -2905,4 +2898,10 @@ msgstr "Era atteso un identificativo di primitiva" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +#, fuzzy +msgid "Range of numbers expected" +msgstr "Era atteso un identificativo del gruppo di modifiche" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -3064,5 +3063,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "Doppio conflitto" @@ -3156,4 +3155,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3166,4 +3166,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "Conferma di cancellazione" @@ -3592,27 +3593,27 @@ "continuare a lavorare senza problemi." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "Manca la destinazione dell''unione per il percorso con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "Manca la destinazione dell''unione per il nodo con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Manca la destinazione dell''unione per l''oggetto con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "Manca la destinazione dell''unione per la relazione con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3622,5 +3623,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3719,5 +3720,5 @@ "nuova primitiva. Il valore dell''identificativo del gruppo di modifiche è {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3726,5 +3727,5 @@ "Impossibile unire perché una delle primitive coinvolte è nuova e l''altra no" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4411,5 +4412,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Modifica" @@ -5352,5 +5353,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "Applica" @@ -5774,5 +5775,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5928,5 +5929,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7740,5 +7741,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7974,22 +7975,29 @@ msgstr "Elimina la relazione correntemente modificata" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "Si, crea un conflitto e chiudi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" "Cliccare per creare un conflitto e chiudere questo editor delle relazioni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "No, continua la modifica" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "Cliccare per ritornare alla modifica della relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8001,5 +8009,5 @@ "desidera creare un conflitto e chiudere l''editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -8011,47 +8019,47 @@ "riprovare." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "Applica gli aggiornamenti correnti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "Applica gli aggiornamenti e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "Annulla gli aggiornamenti e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "Aggiungi una etichetta vuota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "Scarica tutti i membri incompleti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Scarica i membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "Editor delle relazioni: Scarica membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "Scarica i membri incompleti selezionati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "Imposta un ruolo ai membri selezionati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "Applica Ruolo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8060,25 +8068,25 @@ msgstr[1] "Si sta impostando un ruolo vuoto su {0} primitive." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "Questo equivale all''eliminazione dei ruoli di queste primitive." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "Si desidera veramente applicare il nuovo ruolo?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "Si, applica" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "No, non applicare" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "Conferma ruolo vuoto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8563,5 +8571,5 @@ "messaggio di errore è (non tradotto):
{1}

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8573,19 +8581,19 @@ "di controllare
la propria connessione ad internet" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "Fallita l''apertura dell''indirizzo URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "Apri la pagina di aiuto corrente in un browser esterno" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "Modifica la pagina di aiuto corrente" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8598,24 +8606,24 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "Ricarica la pagina di aiuto corrente" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "Vai alla pagina precedente" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "Vai alla pagina successiva" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "Vai alla pagina iniziale di aiuto a JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" @@ -8623,5 +8631,5 @@ "Attenzione: posizione errata nel documento HTML. L''eccezione è stata: {0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" @@ -8629,5 +8637,5 @@ "è vuoto." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "Fallita l''apertura della pagina di aiuto" @@ -11510,5 +11518,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Scegli la riga da modificare." @@ -11522,5 +11530,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -13357,5 +13365,5 @@ msgstr "Fallita l''apertura del flusso di ingresso per la risorsa ''''{0}''''" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -17935,29 +17943,15 @@ msgstr "Percorsi incrociati" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Nodi duplicati" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "" "Questo controllo verifica che non ci siano due nodi nella stessa posizione." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Stai per cancellare dei nodi fuori dall''area scaricata.
Questo potrebbe " -"causare dei problemi poiché i nodi potrebbero far parte di altri oggetti " -"(che non puoi vedere).
Vuoi veramente cancellarli?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "Conferma" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "Nodi nella stessa posizione" @@ -18123,9 +18117,9 @@ "essere errori d''ortografia." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Analizzatore delle proprietà :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "" @@ -18133,15 +18127,15 @@ "proprietà." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Linea TagChecker non valida - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Linea di correzione ortografica non valida: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -18152,7 +18146,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "Combinazione illegale etichetta/valore" @@ -18160,43 +18154,43 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "Problema di disegno" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Chiave ''{0}'' non valida." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Tag con valori vuoti" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "chiave della proprietà non valida" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "spazio non valido nella chiave della proprietà" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "Il valore della proprietà inizia o finisce con uno spazio" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "Il valore della proprietà contiene una entità HTML" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Chiave ''''{0}'''' non presente nei preimpostati." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "I preimpostati non contengono la chiave della proprietà" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." @@ -18204,17 +18198,17 @@ "Valore ''''{0}'''' per la chiave ''''{1}'''' non presente nei preimpostati." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "I preimpostati non contengono il valore della proprietà" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "FIXME" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Verifica le chiavi delle proprietà." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" @@ -18222,22 +18216,22 @@ "valide." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "Usa un analizzatore delle proprietà complesso." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" "Valida i valori delle proprietà e delle etichette usando regole complesse." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "Sorgente TagChecker" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -18248,25 +18242,25 @@ "delle etichette." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Aggiungi una nuova sorgente alla lista." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "Modifica la sorgente selezionata." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Elimina la sorgente selezionata nella lista." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Sorgenti dei dati" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Verifica i valori delle proprietà." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" @@ -18274,9 +18268,9 @@ "validi." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Cerca FIXME." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" @@ -18284,25 +18278,25 @@ "proprietà." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "Controllare le note di disegno." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "Controllare se il disegno della mappa contiene degli errori." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Usa file dati predefinito." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Usa il file dati predefinito (consigliato)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "Utilizza il file di \"ignoramento\" dell''etichetta predefinita" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" @@ -18310,19 +18304,23 @@ "(consigliato)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Usa file di controllo ortografico predefinito." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "Usa il file di controllo ortografico predefinito (consigliato)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Correggi proprietà" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "Impossibile trovare il tipo di elemento" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -31833,4 +31831,22 @@ msgstr "Sicilia - Italia" +#~ msgid "" +#~ msgstr "" + +#~ msgid "range" +#~ msgstr "intervallo" + +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Stai per cancellare dei nodi fuori dall''area scaricata.
Questo " +#~ "potrebbe causare dei problemi poiché i nodi potrebbero far parte di altri " +#~ "oggetti (che non puoi vedere).
Vuoi veramente cancellarli?" + +#~ msgid "Confirmation" +#~ msgstr "Conferma" + #~ msgid "No data imported." #~ msgstr "Nessun dato importato." Index: applications/editors/josm/i18n/po/ja.po =================================================================== --- applications/editors/josm/i18n/po/ja.po (revision 20158) +++ applications/editors/josm/i18n/po/ja.po (revision 20175) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-23 08:09+0000\n" -"Last-Translator: Hiroshi Miura \n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-25 03:50+0000\n" +"Last-Translator: higa4 \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:28+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: JAPAN\n" @@ -74,6 +74,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -252,5 +253,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -400,5 +401,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -492,6 +493,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -707,5 +708,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -824,5 +825,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "複製" @@ -1229,5 +1230,5 @@ "Cannot open {0} files because no suitable file importer is available." msgstr[0] "" -msgstr[1] "" +"{0} ファイルをオープンできません。利用可能なファイルインポータがありません。" #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:189 @@ -1993,4 +1994,6 @@ "''{0}''.
You have to resolve them first." msgstr "" +"アップロードされるデータはレイヤ ''{0}'' の未解決の競合に参加していま" +"す。
これを最初に解決してください。" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153 @@ -2469,45 +2472,37 @@ "移動; 右ドラッグによるズーム" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2827,4 +2822,10 @@ msgstr "プリミティブIDを期待" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +#, fuzzy +msgid "Range of numbers expected" +msgstr "変更セットIDを期待" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2983,5 +2984,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "二重の競合" @@ -3070,4 +3071,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3080,4 +3082,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "削除確認" @@ -3489,27 +3492,27 @@ "い。これは深刻なエラーではなく、作業を継続しても安全と思われます。" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "ID {0} のウェイの結合ターゲットが見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "ID {0} のノードの結合ターゲットが見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "ID {0} のオブジェクトの結合ターゲットが見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "ID {0} のリレーションの結合ターゲットが見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3519,5 +3522,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3612,5 +3615,5 @@ "は {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3618,5 +3621,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4282,5 +4285,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "編集" @@ -5171,5 +5174,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "適用" @@ -5553,5 +5556,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5707,5 +5710,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く" @@ -7455,5 +7458,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7677,21 +7680,28 @@ msgstr "現在編集されたリレーションを削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "はい、競合を作成して閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "クリックして競合を作成し、このリレーションエディタを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "いいえ、編集を続ける" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "クリックしてリレーションエディタに戻り、リレーション編集を再開" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7702,5 +7712,5 @@ "集を続けることはできません

競合を作成してエディタを閉じますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7711,47 +7721,47 @@ "最初にこの競合を解決してからやり直してください。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "現在の更新を適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "更新を適用してダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "更新をキャンセルしてダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "空のタグを追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "全ての不完全なメンバーをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "メンバーのダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "リレーション編集画面: メンバーをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "選択された不完全なメンバーをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "選択されたメンバーにロールをセット" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "ロールを適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7759,25 +7769,25 @@ msgstr[0] "{0} プリミティブに空のロールを設定しています。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "これはこれらのプリミティブのロールを削除することと同じです" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "新しいロールを本当に適用しますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "はい、適用します" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "いいえ、適用しません" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "空のロールを確認" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "現在選択中のリレーションメンバーが参照しているリレーションを編集" @@ -8236,5 +8246,5 @@ "ラーメッセージ (未翻訳):
{1}

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8245,19 +8255,19 @@ "題と思われるので、
インターネット接続を確認してみてください。" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "URLを開けません" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "現在のヘルプページを外部ブラウザで開く" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "現在のヘルプページを編集" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8269,33 +8279,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "現在のヘルプページを再ロード" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "前のページへ" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "次のページへ" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "JOSM ヘルプホームページへ" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "警告: HTML文書に悪いロケーションが指定されています。例外は{0}です。" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "ヘルプページのオープンに失敗。ターゲットURLが空です。" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "ヘルプページのオープンに失敗" @@ -9957,5 +9967,5 @@ "Matched {0} of {1} photos to GPX track." msgstr[0] "" -msgstr[1] "" +"写真は{1} 件中{0} 件がGPSトラックに一致しました。" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672 @@ -10386,14 +10396,14 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78 msgid "Request Token URL:" -msgstr "" +msgstr "リクエストトークンURL:" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89 msgid "Access Token URL:" -msgstr "" +msgstr "アクセストークンURL:" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 msgid "Authorize URL:" -msgstr "" +msgstr "認証URL:" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10464,5 +10474,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:175 msgid "Granted rights" -msgstr "" +msgstr "認められた権利" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:176 @@ -10473,5 +10483,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:358 msgid "Accept Access Token" -msgstr "" +msgstr "アクセストークンを受入れる" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:237 @@ -10486,9 +10496,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 msgid "Authorize now" -msgstr "" +msgstr "今すぐ認証" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 msgid "Click to redirect you to the authorization form on the JOSM web site" -msgstr "" +msgstr "クリックしてJOSMウェブサイト上の認証フォームへリダイレクト" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:365 @@ -10954,5 +10964,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "編集する列を選択してください。" @@ -10966,5 +10976,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12648,5 +12658,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16983,28 +16993,14 @@ msgstr "交差するウェイ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "ノードの複製" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "このテストは全く同じ位置にノードがないことをチェックします。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"ダウンロードしたエリア外のノードを削除しようとしています。
（あなたが見て" -"いない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を引き" -"起こします。
本当に削除しますか？" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "確認" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "同位置のノード" @@ -17159,23 +17155,23 @@ msgstr "このテストはスペルミスの可能性がある似た名前のウェイをチェックします。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "プロパティチェッカー：" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "このプラグインはプロパティのキーと値のエラーをチェックします。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "タグチェッカーライン - {0}: {1}　が不正です。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "スペルチェック行 {0}が不正です" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -17186,7 +17182,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "不正なタグ/値の組み合わせです" @@ -17194,80 +17190,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "色つけに問題発生" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "キー ''{0}''は不正です。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "値のないタグ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "プロパティキーが不正です" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "プロパティのキーとして、不正なスペースが入っています。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "値で、空白文字を最初か最後にあるプロパティ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "HTML書式の値を持つプロパティ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "キー ''{0}'' はプリセットにはありません。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "プリセットはプロパティキーを含みません。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "キー ''{1}'' の値 ''{0}'' はプリセットにはありません。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "プリセットに含まれていない属性値です" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "プロパティのキーをチェック" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "ワードのリストをチェックしてプロパティキーが正しいか検証。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "高度なプロパティチェッカーを使用" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "混合ルールを使用しているプロパティの値とタグを検証" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "タグチェッカーのソース" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -17277,75 +17273,79 @@ "index.php/User:JLS/speller 参照) またはタグをチェックするデータファイル。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "新しいソースをリストに追加" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "選択したソースの編集" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "リストから選択した情報源を削除" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "データソース" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "プロパティの値をチェック" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "プリセットをチェックしてプロパティの値が正しいか検証。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "FIXMEをチェック" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "プロパティの値としてFIXMEをもつノードやウェイを検索" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "Check for paint notes." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "地図塗りつぶしでデータエラーがあるかどうかチェック" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "既定のデータファイルを使用。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "既定のデータファイルを使用(推奨)" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "デフォルトタグを使用、ファイルを無視。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "デフォルトタグを使用、ファイルを無視（推奨）。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "既定のスペルチェックファイルを使用" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "既定のスペルチェックファイルを使用(推奨)" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "プロパティを修正" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "要素タイプを見つけられませんでした。" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -30805,4 +30805,16 @@ msgstr "" +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "ダウンロードしたエリア外のノードを削除しようとしています。
（あなたが見" +#~ "ていない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を" +#~ "引き起こします。
本当に削除しますか？" + +#~ msgid "Confirmation" +#~ msgstr "確認" + #~ msgid "Move" #~ msgstr "移動" Index: applications/editors/josm/i18n/po/nb.po =================================================================== --- applications/editors/josm/i18n/po/nb.po (revision 20158) +++ applications/editors/josm/i18n/po/nb.po (revision 20175) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-01-23 21:14+0000\n" -"Last-Translator: Tor Christian Tovslid \n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-25 16:03+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Norwegian Bokmal \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:30+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:56+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,6 +71,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -244,5 +245,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -388,5 +389,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -480,6 +481,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -696,5 +697,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -812,5 +813,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Fordoble" @@ -1536,5 +1537,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 msgid "No Exporter found! Nothing saved." -msgstr "" +msgstr "Ingen Exporter funnet! Ingenting lagret." #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96 @@ -2439,45 +2440,37 @@ "piltaster; flytt utsnitt med høyre museknapp" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2776,4 +2769,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2924,5 +2922,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "" @@ -3012,4 +3010,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3022,4 +3021,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "" @@ -3411,27 +3411,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3441,5 +3441,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3532,5 +3532,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3538,5 +3538,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4197,5 +4197,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Endre" @@ -5095,5 +5095,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "" @@ -5473,5 +5473,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5627,5 +5627,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7363,5 +7363,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7570,21 +7570,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7593,5 +7600,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7600,47 +7607,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Last ned medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7649,25 +7656,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8105,5 +8112,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8112,19 +8119,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8134,33 +8141,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -10754,5 +10761,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Velg raden som skal endres" @@ -10766,5 +10773,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12440,5 +12447,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16694,28 +16701,14 @@ msgstr "Kryssende veier" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Dobbelt-Noder" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "Denne testen sjekker at det ikke er flere Noder med samme posisjon." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Du er i ferd med å slette noder utenfor nedlastet område.
Dette kan skape " -"problemer fordi de kan være i bruk av andre objekter (som du ikke kan se " -"nå) .
Er du sikker på at du vil slette nodene?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -16870,23 +16863,23 @@ msgstr "Denne test sjekker linjer med liknende navn, som kan bety feilstaving." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Egenskapskontroll" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "Denne programutvidelsen kontrollerer egenskapers nøkler og verdier." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Ugyldig egenskapskontroll-linje – {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ugyldig stavekontroll linje: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16897,7 +16890,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "Ulovlige kombinasjoner Egenskap / Verdi" @@ -16905,80 +16898,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "Problem med visning" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Nøkkel «{0}» er ugyldig." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Egenskaper uten verdier" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "Ulovlig egenskapsnøkkel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "Ulovlig mellomrom i Nøkkel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "Egenskap Verdi starter eller slutter med mellomrom" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "Egenskap Verdi inneholder HTML koding" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Nøkkel «{0}» finnes ikke i objektmalene" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "Objektmalene inneholder ikke Nøkkelen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Verdi «{0}» for nøkkel «{1}» finnes ikke i objektmalene" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "Objektmalen har ikke Egenskapsverdi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "FIXMEs" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Sjekk egenskabsnøkler" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "Bekreft at egenskabsnøklene kan sjekkes mot en ordliste." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "Bruk avansert egenskapskontroll." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "Kontroller egenskapsverdiene med hjelp av avanserte regler." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "Egenskapskontroll-kilde" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -16988,75 +16981,79 @@ "org/index.php/User:JLS/speller) eller \"tag checking data files\"." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Tilføy en ny kilde til lista." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "Rediger valgt kilde." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Slett den valgte kilden fra lista." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Datakilder" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Sjekk egenskapsverdier." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "Bekreft at du vil sjekke egenskapsverdiene imot Objektmalene." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Se etter FIXMEs" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Søker etter noder eller linjer med FIXME i en egenskapsverdi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "Finn notater om tegning." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "Sjekk etter feil ved opptegning." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Bruk standard datafil." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Bruk standard datafil (anbefales)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Bruk standard fil for stavekontroll." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "Brug standard fil for stavekontroll (anbefales)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Korriger egenskaper" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "Kunne ikke finne element-typen" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -19376,5 +19373,5 @@ #: build/trans_presets.java:427 msgid "Ways" -msgstr "Gater" +msgstr "Måter" #. group "Ways" @@ -30486,4 +30483,13 @@ msgstr "" +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Du er i ferd med å slette noder utenfor nedlastet område.
Dette kan " +#~ "skape problemer fordi de kan være i bruk av andre objekter (som du ikke " +#~ "kan se nå) .
Er du sikker på at du vil slette nodene?" + #~ msgid "Move" #~ msgstr "Flytt" Index: applications/editors/josm/i18n/po/nl.po =================================================================== --- applications/editors/josm/i18n/po/nl.po (revision 20158) +++ applications/editors/josm/i18n/po/nl.po (revision 20175) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-21 11:14+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-24 20:13+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Dutch \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:32+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,6 +71,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -251,5 +252,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -398,5 +399,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -490,6 +491,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -708,5 +709,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -824,5 +825,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Dupliceren" @@ -2483,45 +2484,37 @@ "omlaag, rechts; verplaats met rechter knop" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2828,4 +2821,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2985,5 +2983,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "Dubbel conflict" @@ -3075,4 +3073,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3085,4 +3084,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "Bevestig verwijderen" @@ -3477,27 +3477,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "Samenvoeg doel voor weg met id {0} ontbreekt" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "Samenvoeg doel voor knooppunt met id {0} ontbreekt" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Samenvoeg doel voor object met id {0} ontbreekt" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "Samenvoeg doel voor relatie met id {0} ontbreekt" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3507,5 +3507,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3598,5 +3598,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3604,5 +3604,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4267,5 +4267,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Bewerken" @@ -5135,5 +5135,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "" @@ -5517,5 +5517,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5671,5 +5671,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7409,5 +7409,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7616,21 +7616,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7639,5 +7646,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7646,47 +7653,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Leden downloaden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7695,25 +7702,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8152,5 +8159,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8159,19 +8166,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8181,33 +8188,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -10810,5 +10817,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Selecteer een rij om te bewerken." @@ -10822,5 +10829,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12508,5 +12515,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16744,29 +16751,15 @@ msgstr "Kruisende wegen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Dubbele knopen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "" "Deze test controleert of er geen knopen met precies dezelfde locatie zijn." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt " -"gedownload.
Dit kan problemen veroorzaken omdat andere objecten (die je " -"niet ziet) ze kunnen gebruiken.
Wil je ze echt verwijderen?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -16925,24 +16918,24 @@ "gespeld zijn." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Eigenschapchecker:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "" "Deze plugin controleert op fouten in sleutels en waarden van eigenschappen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Ongeldige regel tagchecker - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ongeldige regel spellingschecker: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16953,7 +16946,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "Ongeldige tag/waarde-combinaties" @@ -16961,81 +16954,81 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "Tekenprobleem" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Toets ''{0}'' is ongeldig." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Tags met lege waarden" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "Ongeldige eigenschapsleutel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "Ongeldige spatie in eigenschapsleutel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "Eigenschapwaarde begin of eindigt met een spatie" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "Eigenschapwaarden bevatten HTML-codes" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Sleutel \"{0}\" ontbreekt in voorkeuze." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "Voorkeuzen bevatten geen eigenschapsleutel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Waarde \"{0}\" voor sleutel \"{1}\" niet in voorkeuze." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "Voorkeuzen bevatten geen eigenschapswaarde" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "Herstel-mij's" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Eigenschapsleutels controleren." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "Valideer eigenschapsleutels met een woordenlijst" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "Uitgebreide eigenschapchecker gebruiken" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" "Valideer eigenschapwaarden en -tags door uitgebreide regels toe te passen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "Tagcheckerbron" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -17046,75 +17039,79 @@ "tagchecker." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Nieuwe bron aan lijst toevoegen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "De geselecteerde bron bewerken." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "De geselecteerde bron uit de lijst verwijderen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Gegevensbronnen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Eigenschapwaarden controleren." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "Valideer eigenschapwaarden tegen presets" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Controleer op herstel-mij's." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Knopen of wegen met 'FIXME' in de eigenschapwaarden zoeken." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "Controleer op tekenknopen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "Controleer of kaarttekenen fouten heeft gevonden." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Standaardgegevensbestand gebruiken." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Het standaardgegevensbestand gebruiken (aanbevolen)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Standaardbestand spellingscontrole gebruiken." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "Het standaardbestand spellingscontrole gebruiken (aanbevolen)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Eigenschappen herstellen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "Kan elementsoort niet vinden" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -30522,4 +30519,13 @@ msgstr "Sicilië - Italië" +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt " +#~ "gedownload.
Dit kan problemen veroorzaken omdat andere objecten (die " +#~ "je niet ziet) ze kunnen gebruiken.
Wil je ze echt verwijderen?" + #~ msgid "Select a bookmark first." #~ msgstr "Selecteer eerst een bladwijzer." Index: applications/editors/josm/i18n/po/pl.po =================================================================== --- applications/editors/josm/i18n/po/pl.po (revision 20158) +++ applications/editors/josm/i18n/po/pl.po (revision 20175) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-21 11:00+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-24 21:41+0000\n" "Last-Translator: bastik \n" "Language-Team: Polish \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:32+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -75,6 +75,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -249,5 +250,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -395,5 +396,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -487,6 +488,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -705,5 +706,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -823,5 +824,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Powiel" @@ -2453,45 +2454,37 @@ "+góra, lewo, dół, prawo; przesuń powiększenie prawym przyciskiem" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2785,4 +2778,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2933,5 +2931,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "" @@ -3019,4 +3017,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3029,4 +3028,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "Potwierdź usunięcie." @@ -3429,27 +3429,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3459,5 +3459,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3550,5 +3550,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3556,5 +3556,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4214,5 +4214,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Edycja" @@ -5079,5 +5079,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "" @@ -5459,5 +5459,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5613,5 +5613,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7352,5 +7352,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7559,21 +7559,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7582,5 +7589,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7589,47 +7596,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Pobierz członków" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7638,25 +7645,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8094,5 +8101,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8101,19 +8108,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8123,33 +8130,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -10723,5 +10730,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Proszę wybrać wiersz do edycji" @@ -10735,5 +10742,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12400,5 +12407,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16598,28 +16605,14 @@ msgstr "Przecinające się drogi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Zamierzasz usunąć węzły spoza obszaru, który pobrano.
Może to spowodowac " -"problem, ponieważ inne (niewidoczne dla ciebie) obiekty mogą używać tych " -"węzłów.
Czy naprawdę zamierzasz je usunąć?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -16773,23 +16766,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16798,7 +16791,7 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "" @@ -16806,80 +16799,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "DO POPRAWKI" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -16887,74 +16880,78 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" msgstr "" @@ -30354,4 +30351,13 @@ msgstr "" +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Zamierzasz usunąć węzły spoza obszaru, który pobrano.
Może to " +#~ "spowodowac problem, ponieważ inne (niewidoczne dla ciebie) obiekty mogą " +#~ "używać tych węzłów.
Czy naprawdę zamierzasz je usunąć?" + #~ msgid "Move" #~ msgstr "Przenieś" Index: applications/editors/josm/i18n/po/pt_BR.po =================================================================== --- applications/editors/josm/i18n/po/pt_BR.po (revision 20158) +++ applications/editors/josm/i18n/po/pt_BR.po (revision 20175) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-23 00:48+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-24 20:52+0000\n" "Last-Translator: Vitor George \n" "Language-Team: Brazilian Portuguese \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:31+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,6 +71,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -252,5 +253,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -398,5 +399,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -490,6 +491,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -708,5 +709,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -826,5 +827,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Duplicar" @@ -2506,45 +2507,37 @@ "Abaixo, Direita; mova ampliação com o botão direito" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2863,4 +2856,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -3021,5 +3019,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "Conflito duplo" @@ -3112,4 +3110,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3122,4 +3121,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "Apagar confirmação" @@ -3543,27 +3543,27 @@ "trabalho." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "Faltando alvo de mescla para via com id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "Faltando alvo de mescla para nó com id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Faltando alvo de mescla para objeto com id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "Faltando alvo de mescla para relação com id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3573,5 +3573,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3669,5 +3669,5 @@ "do changesetId é {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3675,5 +3675,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4345,5 +4345,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Editar" @@ -5253,5 +5253,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "Aplicar" @@ -5646,5 +5646,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5800,5 +5800,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "Criar uma cópia desta relação e abri-la em outra janela de edição" @@ -7537,5 +7537,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7752,21 +7752,28 @@ msgstr "Apagar a relação editada atual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "Sim, crie um conflito e feche" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "Não, continuar editando" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7775,5 +7782,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7782,47 +7789,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "Aplciar as atualizações correntes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "Aplicar atualizações e fechar aviso" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "Cancelar atualizações e fechar janela" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "Adicionar uma tag vazia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "Baixar todos os membros incompletos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Baixar membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "Editor de Relações: Baixar Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "Baixar membros incompletos selecionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "Definir uma papel para membros selecionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "Aplicar papel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7831,25 +7838,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "Sim, aplique" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "Não, não aplicar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "Confirme papel vazio" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "Editar relação referente à relação selecionada atualmente" @@ -8297,5 +8304,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8304,19 +8311,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "Falha ao abrir URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "Abrir página atual de ajuda em browser externo" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "Editar página de ajuda atual" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8326,33 +8333,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "Atualizar a página de ajuda atual" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "Ir para página anterior" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "Ir para próxima página" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "Ir para página inicial da ajuda do JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "Falha ao abrir página de ajuda. O URL de destino está vazio." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "Falha ao abrir página de ajuda." @@ -10965,5 +10972,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Por favor, selecione a linha para editar." @@ -10977,5 +10984,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12646,5 +12653,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16846,28 +16853,14 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Nós duplicados" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "Este teste verifica se não há nós na mesma posição." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Você está a ponto de apagar nós fora da área que fez download de dados.
" -"Isto pode causar problemas, já que outros objetos que você não pode ver " -"podem estar usando estes pontos.
Deseja realmente apagar?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "Confirmação" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "Nós na mesma posição" @@ -17022,23 +17015,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -17047,7 +17040,7 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "" @@ -17055,80 +17048,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -17136,74 +17129,78 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Origens de dados" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" msgstr "" @@ -30604,4 +30601,19 @@ msgstr "Sicilia - Italia" +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Você está a ponto de apagar nós fora da área que fez download de dados." +#~ "
Isto pode causar problemas, já que outros objetos que você não pode " +#~ "ver podem estar usando estes pontos.
Deseja realmente apagar?" + +#~ msgid "Confirmation" +#~ msgstr "Confirmação" + #~ msgid "Preparing..." #~ msgstr "Preparando..." Index: applications/editors/josm/i18n/po/ro.po =================================================================== --- applications/editors/josm/i18n/po/ro.po (revision 20158) +++ applications/editors/josm/i18n/po/ro.po (revision 20175) @@ -8,6 +8,6 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-21 11:54+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-24 21:57+0000\n" "Last-Translator: Adi Roiban \n" "Language-Team: Romanian \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " "== 0) && (n != 0))) ? 2: 1));\n" -"X-Launchpad-Export-Date: 2010-02-24 18:25+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: ROMANIA\n" @@ -75,6 +75,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -246,5 +247,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -392,5 +393,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -484,6 +485,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -700,5 +701,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -816,5 +817,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Duplicare" @@ -2418,45 +2419,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2747,4 +2740,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2895,5 +2893,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "" @@ -2982,4 +2980,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -2989,4 +2988,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "" @@ -3374,27 +3374,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3404,5 +3404,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3495,5 +3495,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3501,5 +3501,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4156,5 +4156,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Editare" @@ -5021,5 +5021,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "" @@ -5403,5 +5403,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5557,5 +5557,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7294,5 +7294,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7501,21 +7501,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7524,5 +7531,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7531,47 +7538,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7580,25 +7587,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8033,5 +8040,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8040,19 +8047,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8062,33 +8069,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -10645,5 +10652,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Vă rog selectaţi rândul care va fi editat." @@ -10657,5 +10664,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12310,5 +12317,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16484,25 +16491,14 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -16655,23 +16651,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16680,7 +16676,7 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "" @@ -16688,80 +16684,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -16769,74 +16765,78 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Şterge sursele selectate din listă." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" msgstr "" Index: applications/editors/josm/i18n/po/ru.po =================================================================== --- applications/editors/josm/i18n/po/ru.po (revision 20158) +++ applications/editors/josm/i18n/po/ru.po (revision 20175) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-24 12:47+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-26 12:56+0000\n" "Last-Translator: Calibrator \n" "Language-Team: Koptev Oleg \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:25+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:56+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" @@ -74,6 +74,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -253,5 +254,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -401,5 +402,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -493,6 +494,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -711,5 +712,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -827,5 +828,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Дублировать" @@ -980,6 +981,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220 msgid "Delete Ways that are not part of an inner multipolygon" -msgstr "" -"Удалить линии, которые не являются внутренней частью области с вложениями" +msgstr "Удалить линии, которые не являются внутренней частью мультиполигона" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 @@ -2536,45 +2536,37 @@ "карту, нажав правую кнопку мыши, или Ctrl+вверх/вниз/влево/вправо" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "<число>" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "диапазон" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2898,4 +2890,10 @@ msgstr "Ожидался id элемента" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +#, fuzzy +msgid "Range of numbers expected" +msgstr "Ожидаемый ID пакета правок" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -3058,5 +3056,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "Двойной конфликт" @@ -3151,4 +3149,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3161,4 +3160,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "Удалить подтверждение" @@ -3584,27 +3584,27 @@ "критическая ошибка, но необходимо сохраниться, прежде чем продолжить работу." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "Отстутствует результат слияния для линии с id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "Отстутствует результат слияния для точки с id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Отстутствует результат слияния для объекта с id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "Отстутствует результат слияния для отношения с id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3614,5 +3614,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3710,5 +3710,5 @@ "- {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3716,5 +3716,5 @@ msgstr "Невозможно слияние, потому что часть элементов новые, а часть нет" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -3853,6 +3853,5 @@ #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." -msgstr "" -"Стиль для внутренней линии ''{0}'' такой же, как у области с вложениями." +msgstr "Стиль для внутренней линии ''{0}'' такой же, как у мультиполигона." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:557 @@ -4405,5 +4404,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Правка" @@ -5337,5 +5336,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "Применить" @@ -5747,5 +5746,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5901,5 +5900,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "Создать копию этого отношения и открыть его в другом окне редактора" @@ -7699,5 +7698,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7933,17 +7932,24 @@ msgstr "Удалить редактируемое отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "Да, создать конфликт и закрыть" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "Щёлкните, чтобы создать конфликт и закрыть этот редактор отношений" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "Нет, продолжить редактирование" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" @@ -7951,5 +7957,5 @@ "отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7961,5 +7967,5 @@ "создать конфликт и закрыть редактор?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7970,47 +7976,47 @@ "
Пожалуйста, устраните этот конфликт, прежде чем продолжать." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "Записать внесённые изменения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "Применить обновления и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "Отменить обновления и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "Добавить пустой тег" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "Скачать всех неполных участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "Редактор отношений: скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "Скачать с сервера выделенных неполных участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "Задать роль для выделенных участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "Применить роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8020,25 +8026,25 @@ msgstr[2] "Вы назначили пустую роль на {0} элементов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "Это эквивалентно удалению ролей из этих элементов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "Вы действительно хотите назначить новую роль?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "Да, записать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "Нет, не записывать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "Подтвердить пустую роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "Выделенный, при редактировании отношения, участник относится к" @@ -8508,5 +8514,5 @@ "
{1}

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8518,19 +8524,19 @@ "интернет" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "Не удалось открыть ссылку" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "Открыть текущую страницу справки во внешнем браузере" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "Править текущую страницу справки" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8542,24 +8548,24 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "Загрузить заново текущую страницу справки" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "Перейти на предыдущую страницу" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "Перейти на следующую страницу" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "Перейти на начальную страницу справки JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" @@ -8567,9 +8573,9 @@ "Предупреждение: плохое расположение в документе HTML. Текст ошибки: {0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "Не удалось открыть справочную страницу. Ссылка пуста." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "Не удалось открыть справочную страницу" @@ -11458,5 +11464,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Пожалуйста, выберите ряд для редактирования." @@ -11470,5 +11476,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -11506,9 +11512,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41 msgid "Named trackpoints." -msgstr "Именованные точки трека." +msgstr "Именованных точек трека" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42 msgid "Modified times (time stamps) of audio files." -msgstr "Изменённых времён (меток времени) звуковых файлов" +msgstr "Времён изменений (меток времени) звуковых файлов" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43 @@ -13272,5 +13278,5 @@ msgstr "Невозможно открыть входящий поток для ресурса ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -17779,28 +17785,14 @@ msgstr "Пересекающиеся линии" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Дублированные точки" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "Этот тест проверяет, чтобы не было наложенных точек." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Вы собираетесь удалить точки, находящиеся за пределами скачиваемой зоны." -"
Это может вызвать проблемы, потому что другие объекты (которых не видно) " -"могут использовать их.
Вы действительно хотите удалить эти точки?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "Подтверждение" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "Точки в одной и той же позиции" @@ -17839,5 +17831,5 @@ #: build/trans_presets.java:3187 msgid "Multipolygon" -msgstr "Область с вложениями" +msgstr "Мультиполигон" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:26 @@ -17960,23 +17952,23 @@ "Этот тест ищет линии с похожими названиями. Возможно, это вызвано опечатками." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Проверка параметров:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "Этот модуль ищет ошибки в названиях ключей и в их значениях." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Неправильная линия анализатора тегов - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ошибка проверки правописания строки: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -17987,7 +17979,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "Неправильная комбинация тегов/значений" @@ -17995,80 +17987,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "Проблемы отображения" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Неправильный ключ {0}." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Теги с пустыми значениями" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "Неверный ключ свойств" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "Неправильный пробел в названии ключа" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "Значение начинается или заканчивается пробелом" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "Значения содержат HTML разметку" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Ключа ''{0}'' нет в настройках." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "Установки не содержат собственно ключа" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Значение ''{0}'' для ключа ''{1}'' не установлены заранне." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "Не содержит зарание устанвленного значения" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "FIXME" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Проверить ключи тегов" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "Проверить, что ключи тегов прошли проверку в отношении списка слов." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "Использовать сложную проверку" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "Проверка корректности значений и тегов, использующих сложные правила." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "Источник средства проверки тегов" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -18078,67 +18070,67 @@ "openstreetmap.org/index.php/User:JLS/speller) или тег проверки файлов данных." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Добавить в список новый источник." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "Править выбранный источник." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Удалить источник из списка." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Источники данных" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Проверить значения тегов" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" "Проверить, что значения тегов прошли проверку в отношении предустановок." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Проверить на FIXME" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Ищет точки или линии с FIXME в любом значении свойства." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "Проверить замечания к рисунку" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "Проверить содержит ли нарисованная карта ошибки данных" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Использовать файл данных по умолчанию" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Используется файл данных, установленный по умолчанию." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "Использовать по умолчанию файл с игнорированными тегами" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" "Использовать по умолчанию файл с игнорированными тегами (рекомендовано)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Использовать установленный по умолчанию файл проверки правописания" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "" @@ -18146,11 +18138,15 @@ "(рекомендуется)" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Исправить параметры" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "Не удалось найти тип элемента" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -22541,5 +22537,5 @@ #: build/trans_presets.java:2819 msgid "Mo-Fr 08:30-20:00" -msgstr "Пн-Пт 08:30-20:00" +msgstr "Mo-Fr 08:30-20:00" #: build/trans_presets.java:1340 build/trans_presets.java:1643 @@ -22571,5 +22567,5 @@ #: build/trans_presets.java:2819 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" -msgstr "Вт-Вс 08:00-15:00; Вс 08:00-12:00" +msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00" #: build/trans_presets.java:1341 @@ -24308,5 +24304,5 @@ #: build/trans_presets.java:1928 build/trans_presets.java:1937 msgid "football" -msgstr "футбол" +msgstr "американский футбол" #: build/trans_presets.java:1910 build/trans_presets.java:1919 @@ -25407,5 +25403,5 @@ #: build/trans_presets.java:2313 msgid "Edit Works" -msgstr "Править Чеха" +msgstr "Править Цеха" #. item "Man Made/Works" text "Name" @@ -26874,5 +26870,5 @@ #: build/trans_presets.java:2982 msgid "Wood" -msgstr "Лесистая местность" +msgstr "Лес" #. item "Land use/Wood" @@ -26899,5 +26895,5 @@ #: build/trans_presets.java:2990 msgid "Forest" -msgstr "Лес" +msgstr "Лесопосадки" #. item "Land use/Forest" @@ -26906,5 +26902,5 @@ #: build/trans_presets.java:2993 msgid "Edit Forest Landuse" -msgstr "Править Лес" +msgstr "Править Лесопосадки" #: build/trans_presets.java:2999 @@ -27216,5 +27212,5 @@ #: build/trans_presets.java:3191 msgid "Edit Multipolygon" -msgstr "Править область с вложениями" +msgstr "Править мультиполигон" #. item "Relations/Multipolygon" text "Name" @@ -31640,4 +31636,23 @@ msgid "Sicily - Italy" msgstr "Sicily - Италия" + +#~ msgid "" +#~ msgstr "<число>" + +#~ msgid "range" +#~ msgstr "диапазон" + +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Вы собираетесь удалить точки, находящиеся за пределами скачиваемой зоны." +#~ "
Это может вызвать проблемы, потому что другие объекты (которых не " +#~ "видно) могут использовать их.
Вы действительно хотите удалить эти " +#~ "точки?" + +#~ msgid "Confirmation" +#~ msgstr "Подтверждение" #~ msgid "No data imported." Index: applications/editors/josm/i18n/po/sk.po =================================================================== --- applications/editors/josm/i18n/po/sk.po (revision 20158) +++ applications/editors/josm/i18n/po/sk.po (revision 20175) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-23 15:19+0000\n" -"Last-Translator: Miroslav Ďurian \n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-24 21:05+0000\n" +"Last-Translator: bastik \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:28+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,6 +71,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -249,5 +250,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -395,5 +396,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -487,6 +488,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -703,5 +704,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -819,5 +820,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Duplikovať" @@ -2495,45 +2496,37 @@ "hore dolu doľava doprava; pohyb so zväčšením možno tiež pravým tlačítkom myši" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2847,4 +2840,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -3002,5 +3000,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "Dvojitý konflikt" @@ -3095,4 +3093,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3105,4 +3104,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "Odstrániť potvrdenie" @@ -3525,27 +3525,27 @@ "kritická chyba, mali by ste bezpečne pokračovať vo vašej práci." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "Chýbajúci cieľ pre spojenie s cestou s id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "Chýba zlúčujúci ciel pre bod s id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Chýba zlúčujúci ciel pre objekt s id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "Chýba zlúčujúci ciel pre reláciu s id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3555,5 +3555,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3649,5 +3649,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3655,5 +3655,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4324,5 +4324,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Upraviť" @@ -5233,5 +5233,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "Použiť" @@ -5624,5 +5624,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5778,5 +5778,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne" @@ -7522,5 +7522,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7745,21 +7745,28 @@ msgstr "Vymazať práve vydanú reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "Áno, vyriešiť konflikt a zavrieť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "Kliknutie vytvorí konflikt a zatvorí editor tejto relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "Nie, pokračovať v editácii" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7771,5 +7778,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7780,47 +7787,47 @@ "rozhodnite najskôr tento konflikt, potom skúste znovu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "Použiť súčasnú aktuálizáciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "Použiť aktualizácie a zavrieť dialógové okno" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "Zrušiť(nepoužiť) aktualizácie a zavrieť dialógové okno" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "Pridať prázdnu značku" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "Stiahnuť všetký nekompletné členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Stiahnuť členov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "Editor Relácií: Sťahovanie Členov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "Stiahnuť vybraté nekompletné členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "Nastavenie funkcie pre vybrané členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "Použiť Funkciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7829,25 +7836,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "Naozaj chcete vymazať vrstvu ''{0}''?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "Áno, Použiť to" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "Nie, použite to" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "Potvrdiť prázdnu funkciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na" @@ -8296,5 +8303,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8303,19 +8310,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "Neúspešné otvorenie URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "Otvoriť aktuálnu stránku pomoci v externom prehliadači" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "Upraviť aktuálnu stránku pomoci" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8327,33 +8334,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "Preložiť aktuálnu stránku pomoci" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "Prejsť na predchádzajúcu stránku" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "Prejsť na nasledujúcu stránku" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "Choďte na JOSM domácu stránku pomoci" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "Neúspešné otvorenie stránky s pomocou. Cieľová URL je prázdna." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "Neúspešné otvorenie stránky s pomocou" @@ -11026,5 +11033,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Prosím vyberte riadok na úpravu." @@ -11038,5 +11045,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12723,5 +12730,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -17106,28 +17113,14 @@ msgstr "Zkrížené cesty" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Duplicitné body" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "Tento test zisťuje či nie je viac bodov na jednom mieste." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Chystáte sa zmazať body mimo Vami stiahnutú oblasť.
Toto môže spôsobiť " -"problém iným objektom (nevidíte ich), ktoré môžu používať tieto body." -"
Naozaj ich chcete zmazať?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "Potvrdenie" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "Body s rovnakou pozíciou" @@ -17286,23 +17279,23 @@ msgstr "Tento test kontroluje cesty na podobnosť mien, keď môže ísť o preklep." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Kontrola vlastností :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "Tento plugin kontroluje chyby kľúčov a ich hodnôt." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Neplatný tagchecker line - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Neplatný spellcheck line: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -17313,7 +17306,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "Neplatná kombinácia klúča/hodnoty" @@ -17321,80 +17314,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "Problém s vykresľováním" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Klúč ''{0}'' je neplatný." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Klúče s prázdnými hodnotami" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "Neplatné vlastnosti kľúča" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "Neplatná medzera vo vlastnosti klúča" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "Hodnota začíná alebo končí medzerou" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "Hodnota obsahuje HTML entitu" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Kľúč ''{0}'' sa nenachádza v zozname predvolených hodnôt." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "Predvoľba neobsahuje vlastnosti kľúča" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Hodnota ''{0}'' pre kľúč ''{1}'' nie je v predvolenom zozname." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "Predvoľba neobsahuje vlastnost hodnoty" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Kontrola vlastností kľúčov." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "Porovnáva hodnoty kľúčov oproti zoznamu slov." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "Použíť komplexnú kontrolu vlastností" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "Kontroluje platnosť hodnôt a značiek pomocou komplexných pravidiel." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "Zdroj pre TagChecker" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -17405,75 +17398,79 @@ "značiek." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Pridať nový zdroj do zoznamu." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "Upraviť zvolený zdroj." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Zmazať vybratý zdroj zo zoznamu." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Zdroje dát" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Kontrola hodnôt vlastností." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "Porovnáva platnosť hodnôt vlastností oproti prednastaveným hodnotám." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Kontrola pre FIXMES." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Vyhľadá body, alebo cesty s FIXME v hodnotách vlastností." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "Kontrola pre poznámky (notes)" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "Kontrola či pri kreslení mapy nevznikli chyby." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Použiť predvolený dátový súbor." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Použiť predvolený dátový súbor (doporučené)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "Použite predvolený súbor pre ignorované značky." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "Použite predvolený súbor pre ignorované značky (doporučené)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Použite predovlený súbor pre spellcheck (preklepy)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "Použite predvolený súbor pre spellcheck (doporučené)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Oprava vlastností" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "Nemôžem nájsť typ elementu" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -30951,4 +30948,16 @@ msgstr "Sicily - Italy" +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Chystáte sa zmazať body mimo Vami stiahnutú oblasť.
Toto môže spôsobiť " +#~ "problém iným objektom (nevidíte ich), ktoré môžu používať tieto body." +#~ "
Naozaj ich chcete zmazať?" + +#~ msgid "Confirmation" +#~ msgstr "Potvrdenie" + #~ msgid "Move" #~ msgstr "Presunúť" Index: applications/editors/josm/i18n/po/sl.po =================================================================== --- applications/editors/josm/i18n/po/sl.po (revision 20158) +++ applications/editors/josm/i18n/po/sl.po (revision 20175) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-21 11:27+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-24 20:27+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Slovenian \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Launchpad-Export-Date: 2010-02-24 18:31+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -72,6 +72,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -243,5 +244,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -387,5 +388,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -479,6 +480,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -691,5 +692,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -807,5 +808,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Podvoji" @@ -2420,45 +2421,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2749,4 +2742,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2897,5 +2895,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "" @@ -2983,4 +2981,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -2990,4 +2989,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "" @@ -3375,27 +3375,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3405,5 +3405,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3496,5 +3496,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3502,5 +3502,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4165,5 +4165,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Uredi" @@ -5030,5 +5030,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "" @@ -5408,5 +5408,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5562,5 +5562,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7302,5 +7302,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7509,21 +7509,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7532,5 +7539,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7539,47 +7546,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7588,25 +7595,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8043,5 +8050,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8050,19 +8057,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8072,33 +8079,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -10657,5 +10664,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Prosim izberite vrstico za urejanje." @@ -10669,5 +10676,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12325,5 +12332,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16508,25 +16515,14 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Podvojena vozlišča" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -16679,23 +16675,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Preverjanje lastnosti:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16704,7 +16700,7 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "" @@ -16712,80 +16708,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -16793,74 +16789,78 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Izbriši izbrani vir iz seznama." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Viri podatkov" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Preveri vrednosti lastnosti." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Uporabi privzeto datoteko." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Uporabi privzeto datoteko (priporočeno)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Uporabi privzeto datoteko za črkovanje." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "Uporabi privzeto datoteko za črkovanje (priporočeno)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Popravi lastnosti" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" msgstr "" Index: applications/editors/josm/i18n/po/sv.po =================================================================== --- applications/editors/josm/i18n/po/sv.po (revision 20158) +++ applications/editors/josm/i18n/po/sv.po (revision 20175) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" "PO-Revision-Date: 2010-01-31 17:45+0000\n" "Last-Translator: Konrad Skeri \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:26+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,6 +71,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -248,5 +249,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -394,5 +395,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -486,6 +487,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -704,5 +705,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -821,5 +822,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Duplicera" @@ -2482,45 +2483,37 @@ "ned, höger; flytta karta med högerknappen" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2837,4 +2830,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2989,5 +2987,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "Dubbel konflikt" @@ -3077,4 +3075,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3087,4 +3086,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "" @@ -3474,27 +3474,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3504,5 +3504,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3595,5 +3595,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3601,5 +3601,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4260,5 +4260,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Redigera" @@ -5125,5 +5125,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "" @@ -5504,5 +5504,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5658,5 +5658,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7396,5 +7396,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7603,21 +7603,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7626,5 +7633,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7633,47 +7640,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Hämta medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7682,25 +7689,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8138,5 +8145,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8145,19 +8152,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8167,33 +8174,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -10776,5 +10783,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Välj vilken rad du vill ändra." @@ -10788,5 +10795,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12472,5 +12479,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16707,29 +16714,15 @@ msgstr "Korsande sträckor" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Dubbletter av noder" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "" "Detta test kontrollerar att det inte finns några noder med precis samma läge." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Du håller på att ta bort noder utanför det område som du har hämtat hem.
" -"Detta kan leda till problem eftersom andra objekt (som du inte ser) kanske " -"använder dem.
Vill du verkligen ta bort dem?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -16888,23 +16881,23 @@ "felstavning." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Egenskapskontrollerare:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "Denna insticksmodul letar efter fel i egenskapsnycklar och -värden." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Ogiltig taggkontrollsrad - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ogiltig rättstavningsrad: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16915,7 +16908,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "Ogiltig kombination av nyckel och värde" @@ -16923,80 +16916,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "Ritningsproblem" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Nyckeln ''{0}'' är ogiltig." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Taggar med tomma värden" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "Ogiltig egenskapsnyckel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "Egenskapsnyckel innehåller ogiltigt blanksteg" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "Egenskapsvärdet börjar eller slutar med blanksteg" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "Det finns en HTML-markör i egenskapsvärdet" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "FIXME-taggar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Kontrollera egenskapsnycklar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "Validera egenskapsnycklar genom att kontrollera mot en lista av ord." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "Använd komplicerad egenskapskontroll." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "Validera egenskapsvärden och taggar med hjälp av komplicerade regler." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "Källa för TagChecker" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -17007,77 +17000,81 @@ "taggkontrollera datafiler." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Lägg till en ny källa till listan." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "Redigera vald källa." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Ta bort vald källa från listan." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Datakällor" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Kontrollera egenskapsvärden" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "" "Validera att egenskapsvärden är giltiga genom kontroll mot förinställningar." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Leta efter FIXME-taggar." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" "Letar efter noder och sträckor som har texten FIXME i något egenskapsvärde." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "Kontrollera om det finns ritningsanmärkningar." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "Kontrollera om problem uppstod vid ritning av kartan" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Använd förvald datafil." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Använd den förvalda datafilen (rekommenderas)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Använd förvalda rättstavningsfil." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "Använd den förvalda rättstavningsfilen (rekommenderas)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Rätta till egenskaper" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "Kunde inte hitta elementtyp" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -30485,4 +30482,13 @@ msgstr "" +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "Du håller på att ta bort noder utanför det område som du har hämtat hem." +#~ "
Detta kan leda till problem eftersom andra objekt (som du inte ser) " +#~ "kanske använder dem.
Vill du verkligen ta bort dem?" + #~ msgid "Move" #~ msgstr "Flytta" Index: applications/editors/josm/i18n/po/tr.po =================================================================== --- applications/editors/josm/i18n/po/tr.po (revision 20158) +++ applications/editors/josm/i18n/po/tr.po (revision 20175) @@ -10,6 +10,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-21 11:42+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-24 21:44+0000\n" "Last-Translator: Yiğit Ateş \n" "Language-Team: Türkçe\n" @@ -18,5 +18,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:33+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -73,6 +73,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -246,5 +247,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -390,5 +391,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -482,6 +483,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -698,5 +699,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -814,5 +815,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "Çift" @@ -2427,45 +2428,37 @@ "sağzoom taşı ise sağ klik" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2759,4 +2752,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2907,5 +2905,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "" @@ -2993,4 +2991,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3002,4 +3001,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "" @@ -3389,27 +3389,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3419,5 +3419,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3510,5 +3510,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3516,5 +3516,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4171,5 +4171,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "Düzenle" @@ -5036,5 +5036,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "" @@ -5412,5 +5412,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5566,5 +5566,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -7300,5 +7300,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7507,21 +7507,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7530,5 +7537,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7537,47 +7544,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "Üyeleri İndir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7586,25 +7593,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8039,5 +8046,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8046,19 +8053,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8068,33 +8075,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -10657,5 +10664,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "Editlemek için bir satır seçiniz." @@ -10669,5 +10676,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12329,5 +12336,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16533,27 +16540,14 @@ msgstr "kesişine yollar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "Çift Noktalar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "Bu test aynı lokasyonda birden fazla nokta varmı kontrol eder." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"İndirdiğiniz alan dışındaki bir kavşağı sileceksiniz.
Göremediğiniz başka " -"objeler onu kullanıyor olabilir.
Gerçekten silmek istiyormusunuz?" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -16707,24 +16701,24 @@ msgstr "Bu test yazım hatalarına karşı test yapar." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "Özellik kontol edici :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "" "Bu test özellik anahtarlarını ve değerlerindeki yanlışları kontrol eder." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Geçersiz etkiket kontrol satırı - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Geçersiz imla yanlışı satırı: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16735,7 +16729,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "Geçersiz etiket/anahtar kombinasyonu" @@ -16743,60 +16737,60 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "Renklendirme problemi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "Anhatar ''{0}'' geçersiz ." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "Boş değerli etiketler" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "Geçersiz özellik anahtar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "Özellik anahtarında geçersiz -boşluk- karakteri" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "Özellik anahtarı -boşluk- karakteri ile başlıyor veya bitiyor" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "Özellik anahtarı HTML bilgisi içeriyor" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "Beni Düzelt!" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "Özellik anahtarını kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "" @@ -16804,22 +16798,22 @@ "kontrol eder." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "Karışık özellik kontrolu kullan." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "" "Özellik anahtar ve etiketlerini karmaşık kuralları kullnarak kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "Etiket kontrolcusu kaynağı" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -16828,75 +16822,79 @@ "İmla kontrolu için kaynak dosya veya link veya etiket kontolcusu veri dosyası" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "Listeye yeni bir kaynak ekle." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "Seçili kaynağı kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "Seçili kaynağı listeden sil." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "Veri kaynakları" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "Özellik değerlerini kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "Önceden tanımlı değerleri kullanarak, özellik değerlerini kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "Beni Düzelt! leri kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Beni Düzelt! değeri içeren yol veya noktalara bak." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "Renklendirme notlarını kontro let." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "Harita renklendirme hata durumunu kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "Varsayılan veri dosyasını kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "Varsayılan veri dosyasını kontrol et (önerilen)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "Varsayılan imla dosyasını kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "Varsayılan imla dosyasını kontrol et (önerilen)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "Özellikler Düzelt" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "Eleman tipi bulunamadı" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -30299,4 +30297,13 @@ msgstr "" +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "İndirdiğiniz alan dışındaki bir kavşağı sileceksiniz.
Göremediğiniz " +#~ "başka objeler onu kullanıyor olabilir.
Gerçekten silmek " +#~ "istiyormusunuz?" + #~ msgid "Preparing..." #~ msgstr "Hazırlanıyor..." Index: applications/editors/josm/i18n/po/zh_TW.po =================================================================== --- applications/editors/josm/i18n/po/zh_TW.po (revision 20158) +++ applications/editors/josm/i18n/po/zh_TW.po (revision 20175) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 19:46+0100\n" -"PO-Revision-Date: 2010-02-21 11:37+0000\n" +"POT-Creation-Date: 2010-02-26 21:00+0100\n" +"PO-Revision-Date: 2010-02-24 20:31+0000\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Traditional Chinese\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2010-02-24 18:32+0000\n" +"X-Launchpad-Export-Date: 2010-02-26 19:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: zh_TW\n" @@ -72,6 +72,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:419 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:795 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 @@ -243,5 +244,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -387,5 +388,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -479,6 +480,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119 @@ -691,5 +692,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95 msgid "Delete" @@ -807,5 +808,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 msgid "Duplicate" msgstr "重製" @@ -2414,45 +2415,37 @@ "動縮放" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:46 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:47 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 -msgid "range" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" msgstr "" @@ -2755,4 +2748,9 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 +msgid "Range of numbers expected" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" @@ -2906,5 +2904,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126 msgid "Double conflict" msgstr "雙重衝突" @@ -2988,4 +2986,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -2997,4 +2996,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 msgid "Delete confirmation" msgstr "刪除動作確認" @@ -3384,27 +3384,27 @@ "openstreetmap.de 回報這個情況。這不是嚴重的錯誤，繼續您的工作應是安全的。" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 #, java-format msgid "Missing merge target for way with id {0}" msgstr "缺少 id {0} 路徑的合併目標" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:232 #, java-format msgid "Missing merge target for node with id {0}" msgstr "缺少 id {0} 節點的合併目標" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 #, java-format msgid "Missing merge target for object with id {0}" msgstr "缺少 id {0} 物件的合併目標" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "缺少 id {0} 關係的合併目標" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:252 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3414,5 +3414,5 @@ #. FIXME: this message does not make sense, source version can not be lower than #. target version at this point -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:289 #, java-format msgid "" @@ -3505,5 +3505,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1022 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1021 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -3511,5 +3511,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1024 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1023 #, java-format msgid "" @@ -4165,5 +4165,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:649 msgid "Edit" msgstr "編輯" @@ -5033,5 +5033,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 msgid "Apply" msgstr "接受" @@ -5411,5 +5411,5 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73 msgid "Add" @@ -5565,5 +5565,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380 msgid "Create a copy of this relation and open it in another editor window" msgstr "建立這個關係的複本並且在另一個編輯器視窗開啟它" @@ -7297,5 +7297,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7509,21 +7509,28 @@ msgstr "刪除目前編輯的關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 +msgid "" +"One or more members of this new relation have been deleted while the " +"relation editor\n" +"was open. They have been removed from the relation members list." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 msgid "Yes, create a conflict and close" msgstr "是，建立衝突並關閉" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Click to create a conflict and close this relation editor" msgstr "點選以建立衝突項目並關閉這個關係編輯器" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "No, continue editing" msgstr "否，繼續編輯" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7534,5 +7541,5 @@ "續編輯。

是否要建立衝突並關閉編輯器？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 #, java-format msgid "" @@ -7543,47 +7550,47 @@ "一次。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 msgid "Apply the current updates" msgstr "套用目前的更新" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 msgid "Apply the updates and close the dialog" msgstr "套用更新並關閉此對話盒" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1201 msgid "Cancel the updates and close the dialog" msgstr "取消更新並關閉此對話盒" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 msgid "Add an empty tag" msgstr "加入空的標籤" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 msgid "Download all incomplete members" msgstr "下載所有未完成的成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1268 msgid "Download Members" msgstr "下載成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269 msgid "Relation Editor: Download Members" msgstr "關係編輯器：下載成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266 msgid "Download selected incomplete members" msgstr "下載選取的未完成成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 msgid "Sets a role for the selected members" msgstr "為選取的成員設定角色" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 msgid "Apply Role" msgstr "套用角色" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7592,25 +7599,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 msgid "Yes, apply it" msgstr "是，套用它" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1329 msgid "No, do not apply" msgstr "否，不套用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335 msgid "Confirm empty role" msgstr "確認空白角色" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403 msgid "Edit the relation the currently selected relation member refers to" msgstr "編輯目前選取關係成員所參照的關係" @@ -8054,5 +8061,5 @@ "
{1}

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:353 #, java-format msgid "" @@ -8061,19 +8068,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:358 msgid "Failed to open URL" msgstr "無法開啟 URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:403 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:410 #, java-format msgid "" @@ -8083,33 +8090,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:433 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:448 msgid "Go to the previous page" msgstr "回到上一頁" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:468 msgid "Go to the next page" msgstr "前往下一頁" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:484 msgid "Go to the JOSM help home page" msgstr "移至 JOSM 求助首頁" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:515 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "警告：在 HTML 文件中有錯誤的位置。例外為：{0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566 msgid "Failed to open help page" msgstr "" @@ -10680,5 +10687,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670 msgid "Please select the row to edit." msgstr "請選擇要編輯的列。" @@ -10692,5 +10699,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 msgid "Please select the row to delete." @@ -12344,5 +12351,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:104 +#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105 #, java-format msgid "" @@ -16551,27 +16558,14 @@ msgstr "路徑交叉" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:55 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208 msgid "Duplicated nodes" msgstr "重複的節點" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56 msgid "This test checks that there are no nodes at the very same location." msgstr "這會測試有沒有位置非常相近的節點存在。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"您將要刪除在下載的區域外的節點。
這樣有時會發生問題，因為其他物件（您沒有" -"看到的）可能會使用它們。
確定要刪除嗎？" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161 -msgid "Confirmation" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 msgid "Nodes at same position" msgstr "" @@ -16724,23 +16718,23 @@ msgstr "這個測試會檢查名稱近似的路徑，因為那有可能是拼錯字了。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:152 msgid "Properties checker :" msgstr "屬性檢查器：" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." msgstr "這個外掛程式會檢查屬性中的設定鍵和數值有無錯誤。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:285 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "無效的標籤檢查行- {0}： {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:298 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "無效的拼字檢查行：{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:309 #, java-format msgid "" @@ -16751,7 +16745,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:434 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:445 msgid "Illegal tag/value combinations" msgstr "不合法的標籤/數值組合" @@ -16759,80 +16753,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460 msgid "Painting problem" msgstr "繪圖問題" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:470 #, java-format msgid "Key ''{0}'' invalid." msgstr "設定鍵「{0}」無效。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475 msgid "Tags with empty values" msgstr "標籤沒有數值" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481 msgid "Invalid property key" msgstr "無效的屬性設定鍵" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487 msgid "Invalid white space in property key" msgstr "屬性設定鍵中有無效的空白字元" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493 msgid "Property values start or end with white space" msgstr "屬性數值以空白字元開頭或結尾" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:499 msgid "Property values contain HTML entity" msgstr "屬性數值含有 HTML 標記" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526 #, java-format msgid "Key ''{0}'' not in presets." msgstr "設定鍵「{0}」不在預設組合裡。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527 msgid "Presets do not contain property key" msgstr "預設組合不包含屬性設定鍵" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "設定鍵「{1}」的數值「{0}」不在預設組合中。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550 msgid "Presets do not contain property value" msgstr "預設組合不包含屬性數值" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:609 msgid "Check property keys." msgstr "檢查屬性設定鍵。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610 msgid "Validate that property keys are valid checking against list of words." msgstr "檢查文字清單以驗證屬性設定鍵是有效的。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:617 msgid "Use complex property checker." msgstr "使用複雜的屬性檢查器。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 msgid "Validate property values and tags using complex rules." msgstr "使用複雜的規則驗證屬性數值。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679 msgid "TagChecker source" msgstr "標籤檢查器來源" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -16842,75 +16836,79 @@ "openstreetmap.org/index.php/User:JLS/speller）" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703 msgid "Add a new source to the list." msgstr "將新的來源加入清單。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 msgid "Edit the selected source." msgstr "編輯選取的來源。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 msgid "Delete the selected source from the list." msgstr "從清單刪除選取的來源。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707 msgid "Data sources" msgstr "資料來源" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727 msgid "Check property values." msgstr "檢查屬性數值。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Validate that property values are valid checking against presets." msgstr "驗證屬性數值合於預設組合的要求。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735 msgid "Check for FIXMES." msgstr "檢查 FIXMES。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "尋找在任何屬性數值中含有 FIXME 的節點或路徑。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743 msgid "Check for paint notes." msgstr "檢查繪圖筆記。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Check if map painting found data errors." msgstr "檢查地圖繪製是否發現資料錯誤。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:751 msgid "Use default data file." msgstr "使用預設的資料檔案。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 msgid "Use the default data file (recommended)." msgstr "使用預設的資料檔案（建議值）。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:755 msgid "Use default tag ignore file." msgstr "使用預設標籤忽略檔案。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 msgid "Use the default tag ignore file (recommended)." msgstr "使用預設標籤忽略檔案（建議值）。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:759 msgid "Use default spellcheck file." msgstr "使用預設的拼字檢查檔案。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760 msgid "Use the default spellcheck file (recommended)." msgstr "使用預設的拼字檢查檔案（建議值）。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:854 msgid "Fix properties" msgstr "修正屬性" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969 msgid "Could not find element type" msgstr "找不到元件類型" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +msgid "Incorrect number of parameters" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989 @@ -30325,4 +30323,12 @@ msgstr "" +#~ msgid "" +#~ "You are about to delete nodes outside of the area you have downloaded." +#~ "
This can cause problems because other objects (that you don't see) " +#~ "might use them.
Do you really want to delete?" +#~ msgstr "" +#~ "您將要刪除在下載的區域外的節點。
這樣有時會發生問題，因為其他物件（您沒" +#~ "有看到的）可能會使用它們。
確定要刪除嗎？" + #~ msgid "Open in Browser" #~ msgstr "在瀏覽器中打開"