Index: /applications/editors/josm/i18n/po/ar.po =================================================================== --- /applications/editors/josm/i18n/po/ar.po (revision 23003) +++ /applications/editors/josm/i18n/po/ar.po (revision 23004) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 22:24+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-03 00:03+0000\n" +"Last-Translator: Hsn \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\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-09-02 17:01+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -87,5 +87,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -249,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:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -417,5 +417,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -433,5 +433,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -605,10 +605,10 @@ msgstr "لا يمكن تجميع الطرق (لا يمكن دمجها في سلسلة عقد واحدة)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "ادمج {0} طرقات" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "الرجاء إختر على الأقل طريقتين للدمج." @@ -657,5 +657,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -771,5 +771,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:84 msgid "Start downloading" -msgstr "" +msgstr "بدأ التنزيل" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:85 @@ -795,5 +795,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "نسخة مطابقة" @@ -1494,8 +1494,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1554,6 +1554,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "خطأ" @@ -1714,5 +1714,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "" @@ -2941,5 +2941,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3063,5 +3063,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3402,10 +3402,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "ملف إعدادات غير صحيح التكوين في الأسطر {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3414,5 +3414,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3421,5 +3421,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3428,5 +3428,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3435,5 +3435,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3441,5 +3441,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3448,5 +3448,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3455,5 +3455,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3462,5 +3462,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3469,10 +3469,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4719,5 +4719,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4735,5 +4735,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5242,5 +5242,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5915,5 +5915,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5996,5 +5996,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7780,5 +7780,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7835,26 +7835,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +msgid "Apply Role:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 -msgid "Apply Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7863,14 +7863,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7880,9 +7880,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7892,15 +7892,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7908,5 +7908,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7914,20 +7914,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7936,64 +7936,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +msgid "Sort the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 -msgid "Sort the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 +msgid "Reverse the order of the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 -msgid "Reverse the order of the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8002,23 +8002,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8027,5 +8027,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8034,50 +8034,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 +msgid "Download all incomplete members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 -msgid "Download all incomplete members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "نزّل الأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +msgid "Sets a role for the selected members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 -msgid "Sets a role for the selected members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8086,29 +8086,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8472,4 +8472,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12087,9 +12088,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -13308,11 +13309,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -13784,13 +13785,17 @@ msgstr "جاري الإتصال بالخادم" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "إستحالة الإتصال بالخادم أو.أس.أم. الرجاء فحص إتصالات الإنترنت." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14520,11 +14525,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16019,5 +16024,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "" @@ -18054,10 +18059,10 @@ msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20050,25 +20055,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "غيّر إسم الطبقة" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "الخدمات" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "الطبقات" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20076,43 +20078,41 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "خطأ" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -msgid "Show Bounds" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." msgstr "" @@ -20229,24 +20229,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20257,67 +20257,67 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "" @@ -20335,21 +20335,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "" Index: /applications/editors/josm/i18n/po/bg.po =================================================================== --- /applications/editors/josm/i18n/po/bg.po (revision 23003) +++ /applications/editors/josm/i18n/po/bg.po (revision 23004) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 21:52+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 22:10+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Bulgarian \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-09-02 17:01+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -254,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:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -424,5 +424,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -440,5 +440,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -616,10 +616,10 @@ "последователност от възли)." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Обединяване {0} линии" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Моля, изберете поне две линии за комбиниране." @@ -668,5 +668,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -807,5 +807,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Дублиране" @@ -1513,8 +1513,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1573,6 +1573,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Грешка" @@ -1739,5 +1739,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Не, изход" @@ -3008,5 +3008,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3132,5 +3132,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Двоен конфликт" @@ -3481,10 +3481,10 @@ msgstr "Внимание: неуспешно записване на предпочитанията в ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Грешка в конфигурационния файл на линии {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3495,5 +3495,5 @@ "предпочитания ''{0}'' не е директория." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3504,5 +3504,5 @@ "предпочитания ''{0}'' не е директория." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3513,5 +3513,5 @@ "на липсваща директория за параметри: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3522,5 +3522,5 @@ "липсваща директория за параметри: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3528,5 +3528,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3535,5 +3535,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3542,5 +3542,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3549,5 +3549,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3556,10 +3556,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4801,5 +4801,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4817,5 +4817,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5327,5 +5327,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5996,5 +5996,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -6077,5 +6077,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7863,5 +7863,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7920,26 +7920,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Етикети и членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Родителски релации" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Подчинени релации" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +msgid "Apply Role:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 -msgid "Apply Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7948,14 +7948,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7965,9 +7965,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7977,15 +7977,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7993,5 +7993,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7999,20 +7999,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Редактор на отношения: Премахване на избраното" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8021,64 +8021,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Сортиране на членовете на връзката" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Редактор на връзки: Сортиране" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 +msgid "Reverse the order of the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 -msgid "Reverse the order of the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Преместване на текущо избраните членове нагоре" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Редактор на връзки: Преместване нагоре" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Преместване на текущо избраните членове надолу" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Редактор на връзки: Преместване надолу" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Премахване на текущо избраните членове от тази връзка" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Редактор на връзки: Премахване" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Изтриване на текущо редактираната врзка" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8087,23 +8087,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Да, създай конфликт и затвори" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Не, продължава редактирането" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8112,5 +8112,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8119,50 +8119,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Прилагане на обновяването и затваряне на прозореца." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Прекъсване на обновяването и затваряне на диалоговия прозорец" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Добави празен етикет" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 +msgid "Download all incomplete members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 -msgid "Download all incomplete members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Сваляне членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Редактор на връзки: Сваляне на членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Установява роля за избраните членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Приложи роля" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8171,29 +8171,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "Да, приложи го!" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Не, не прилагай!" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Потвърди празна роля" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8561,4 +8561,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12252,9 +12253,9 @@ msgstr "Настройка на достъпните разширения." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -13472,11 +13473,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Code={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -13950,14 +13951,18 @@ msgstr "Свързване със сървъра..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "" "Неуспешно свързване с OSM сървъра. Моля проверете вашата връзка към интернет." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14696,11 +14701,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16221,5 +16226,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Празен слой" @@ -18300,10 +18305,10 @@ msgstr "Разделяне на сграда" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20317,25 +20322,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Запис на слоя WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Име на меню" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Помощна улица" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Слоеве" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20343,45 +20345,41 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Грешка" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Не е намерен" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Не чертай линии между точките на този слой." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "Невалиден URL?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." msgstr "" @@ -20500,24 +20498,24 @@ "Това може да доведе до погрешни координати." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS слой ({0}), автоматично сваляне в мащаб {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS слой ({0}), сваляне в мащаб {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20532,17 +20530,17 @@ "WMS въпреки всичко?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "Да, дръпни изображенията" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "Невалиден URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Сваляне на видимите квадранти" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20551,50 +20549,50 @@ "разделителната способност." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Смяна разделителна способност" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Презареждане грешни квадранти" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Алфа канал" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Запис на WMS слоя във файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Запис на слоя WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Зареждане на WMS слой от файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Четене на WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Грешка във формата на файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Грешка при зареждане на файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Автоматично сваляне" @@ -20612,21 +20610,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Отворете празен WMS слой за да заредите данни от файл" @@ -20649,7 +20652,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMS URL" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -34857,7 +34859,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Въведете име на меню и WMS URL" - #~ msgid "" #~ "There were problems with the following plugins:\n" @@ -35263,4 +35262,7 @@ #~ "ограничения, ако има съмнения, по-добре не използвайте." +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Въведете име на меню и WMS URL" + #~ msgid "Copy Default" #~ msgstr "Копирай стойностите по подразбиране" Index: /applications/editors/josm/i18n/po/cs.po =================================================================== --- /applications/editors/josm/i18n/po/cs.po (revision 23003) +++ /applications/editors/josm/i18n/po/cs.po (revision 23004) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 22:13+0000\n" -"Last-Translator: bastik \n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 21:57+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Czech \n" "MIME-Version: 1.0\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-09-02 16:56+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -255,5 +255,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -425,5 +425,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -441,5 +441,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -615,10 +615,10 @@ msgstr "Nemohu spojit cesty (Nemohou být spojeny do jednoho řetězce bodů)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Kombinovat {0} cesty" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Prosím zvolte minimálně dvě cesty ke spojení" @@ -668,5 +668,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -806,5 +806,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplikovat" @@ -1517,8 +1517,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1577,6 +1577,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Chyba" @@ -1743,5 +1743,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Ne, zrušit" @@ -3031,5 +3031,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3154,5 +3154,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Dvojí konflikt" @@ -3510,10 +3510,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Poškozený konfigurační soubor na řádku {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3524,5 +3524,5 @@ "adresářem." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3531,5 +3531,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3538,5 +3538,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3545,5 +3545,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3551,5 +3551,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3558,5 +3558,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3565,5 +3565,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3572,5 +3572,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3579,10 +3579,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Chyba: neočekávaná řádka ''{0}'' v souboru záložek ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4842,5 +4842,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4858,5 +4858,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5384,5 +5384,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6067,5 +6067,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 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ě" @@ -6148,5 +6148,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7949,5 +7949,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8009,26 +8009,26 @@ msgstr "({0}/{1}): Stahuji relaci ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Značky a Členové" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Rodičovské relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Potomci relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Aplikovat roli:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Zadat roli, která se aplikuje na vybrané členy relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8040,14 +8040,14 @@ "provést s touto cyklickou závislostí?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Odstranit, vyčistit relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignorovat, ponechat relaci jak je" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8059,9 +8059,9 @@ "''{0}''

Opravdu chcete přidat dalšího člena relace?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Více členů odkazuje na stejný prvek" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8074,10 +8074,10 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "Přidat všechny vybrané prvky z aktuální datové sady před prvního člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8085,5 +8085,5 @@ "Přidat všechny vybrané prvky z aktuální datové sady za posledního člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8093,5 +8093,5 @@ "člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8101,20 +8101,20 @@ "člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Odstranit všechny členy odkazující na některý z vybraných prvků" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Editor relací: Odstranit vybrané" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Vybrat členy relace odkazující na prvky v aktuálním výběru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8123,64 +8123,64 @@ msgstr "Vybrat členy relace odkazující na {0} prvků v aktuálním výběru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Vybrat prvky pro vybrané členy relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Seřadit členy relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Řadit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Editor relací: Třídění" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Obrátí pořadí členů relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Obrátit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Editor relací: Obrátit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Přesunout zvolené členy nahoru" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Editor relací: Posun nahoru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Přesunout zvolené členy dolů" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Editor relací: Posun dolů" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Odstranit vybrané členy z relace" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Editor relací: Odstranit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Smazat editovanou relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8189,23 +8189,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 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:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Ne, pokračovat v editaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8214,5 +8214,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8221,50 +8221,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Aplikovat aktuální změny" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 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:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 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:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Přidat prázdnou značku" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Stáhnout všechny nekompletní členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Stáhnout prvky" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Editor relací: Stáhnout členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Stáhnout vybrané nekompletní členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Nastaví roli pro vybrané členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Aplikovat roli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8273,29 +8273,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "Ano, aplikovat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Ne, neaplikovat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Potvrdit prázdnou roli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Upravit relaci na kterou odkazuje vybraný člen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8665,4 +8665,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12418,9 +12419,9 @@ msgstr "Nastavení dostupných pluginů." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "Stáhnout pluginy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Některá nastavení se projeví až po restartování JOSM." @@ -13666,11 +13667,11 @@ msgstr "Očekávána otevřená sada změn. Nalezena uzavřená sada změn s id {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Kód={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14155,10 +14156,10 @@ msgstr "Kontaktuji server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "Nepodařilo se navázat spojení s API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." @@ -14166,4 +14167,8 @@ "Nemohu se připojit k OSM serveru. Prosím zkontrolujte si připojení k " "internetu." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14932,11 +14937,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16458,5 +16463,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Prázdná vrstva" @@ -18534,10 +18539,10 @@ msgstr "Řada domů" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20557,25 +20562,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Uložit WMS vrstvu" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Jméno v menu" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Účelová komunikace" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Vrstvy" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20583,48 +20585,43 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Chyba" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Hranice" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Nereslit spojnice mezi body v této vrstvě" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "Neplatné URL?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "Nepovedlo se importovat soubory." +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -20742,5 +20739,5 @@ "Toto může vést ke špatným souřadnicím." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -20749,19 +20746,19 @@ "url ''{0}''" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(deaktivované)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS vrstva ({0}), automatické stahování v přiblížení {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS vrstva ({0}), stahování v přiblížení {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20776,17 +20773,17 @@ "znovu?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "Ano, stahovat obrázky" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "Neplatné URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Nahrát viditelné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20794,50 +20791,50 @@ "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Změnit rozlišení" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Znovu nahrát chybné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Uložit WMS vrstvu do souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Uložit WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Nahrát WMS vrstvu ze souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Načíst vrstvu WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Chyba formátu souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Chyba při nahrávání souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "Nastavit záložku WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Automatické stahování" @@ -20855,21 +20852,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "K nahrání dat ze souboru otevřete nejprve prázdnou WMS vrstvu" @@ -20892,7 +20894,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMS URL" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -35104,7 +35105,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Zadejte jméno v menu a WMS URL" - #~ msgid "Email" #~ msgstr "E-mail" @@ -35640,4 +35638,7 @@ #~ msgid "Import TCX File..." #~ msgstr "Importovat TCX soubor..." + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Zadejte jméno v menu a WMS URL" #~ msgid "Please select the row to copy." Index: /applications/editors/josm/i18n/po/da.po =================================================================== --- /applications/editors/josm/i18n/po/da.po (revision 23003) +++ /applications/editors/josm/i18n/po/da.po (revision 23004) @@ -9,6 +9,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 22:06+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 21:29+0000\n" "Last-Translator: Lasse Luttermann \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-09-02 16:53+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -87,5 +87,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -255,5 +255,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -425,5 +425,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -441,5 +441,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -616,10 +616,10 @@ "Kunne ikke kombinere veje (de kunne ikke samles i en enkelt række punkter)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Kombiner {0} veje" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Vælg mindst to veje at kombinere." @@ -670,5 +670,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -808,5 +808,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplikér" @@ -1524,8 +1524,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1584,6 +1584,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Fejl" @@ -1748,5 +1748,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Nej, afbryd" @@ -3038,5 +3038,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3162,5 +3162,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Dobbelt konflikt" @@ -3512,10 +3512,10 @@ msgstr "Advarsel: Kunne ikke gemme indstillinger i \"{0}\"" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Fejl i konfigurationsfilen ved linjerne {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3526,5 +3526,5 @@ "er ikke en mappe." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3535,5 +3535,5 @@ "ikke en mappe." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3544,5 +3544,5 @@ "manglende indstillingsmappe: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3553,5 +3553,5 @@ "indstillingsmappe: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3561,5 +3561,5 @@ "indstillingsfil." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3570,5 +3570,5 @@ "indstillingsfil." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3579,5 +3579,5 @@ "indstillingsfil til standard: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3588,5 +3588,5 @@ "
og opretter en ny standard-indstillingsfil." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3597,10 +3597,10 @@ "indstillingsfil til standard: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Fejl: Uventet linje ''{0}'' i bogmærkefil ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4869,5 +4869,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4885,5 +4885,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5424,5 +5424,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6121,5 +6121,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -6203,5 +6203,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -8027,5 +8027,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8084,26 +8084,26 @@ msgstr "({0}/{1}): Downloader relation ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Tags og medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Forældrerelationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Barnerelationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Anvend rolle:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Indtast en rolle og brug den med de markerede relationsmedlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8115,14 +8115,14 @@ "
Hvordan ønsker du at fortsætte med cirkulære afhængigheder?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Fjern dem og ryd op i relationen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignorer dem og lad relationen være som den er." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8135,9 +8135,9 @@ "relationsmedlem?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Flere medlemmer der refererer til samme primitiv." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8150,5 +8150,5 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8156,5 +8156,5 @@ "Tilføj alle primitiver markeret i det nuværende datasæt før det første medlem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8163,5 +8163,5 @@ "medlem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8171,5 +8171,5 @@ "markerede medlem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8179,15 +8179,15 @@ "markerede medlem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Fjern alle medlemmer der refererer til en af de markerede primitiver" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Relationseditor: Fjern markerede" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -8196,5 +8196,5 @@ "markering" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8205,64 +8205,64 @@ "markering" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Markér primitiver for markerede relationsmedlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Sortér relationsmedlemmerne" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Sortér" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Relationseditor: Sortér" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Reversér relationsmedlemmernes rækkefølge" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Omvendt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Relationseditor: Reversér" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Flyt de nu markerede medlemmer op" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Relationseditor: Flyt op" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Flyt de nu markerede medlemmer ned" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Relationseditor: Flyt ned" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Fjern de nu markerede medlemmer fra denne relation" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Relationseditor: Fjern" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Slet den redigerede relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8271,23 +8271,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Ja, opret en konflikt og luk" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 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:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Nej, fortsæt redigeringen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8299,5 +8299,5 @@ "oprette en konflikt og lukke editoren?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8308,50 +8308,50 @@ "venligst denne konflikt først og prøv så igen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Tilføj de aktuelle opdateringer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 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:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 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:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Tilføj en tom tag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Download alle ufuldstændige medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Download medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Relationseditor: Download medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Download markerede ufuldstændige medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 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:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Anvend rolle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8360,29 +8360,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 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:1343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Ja, anvend den" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Nej, anvend den ikke" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Bekræft tom rolle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Redigér den relation det nu markerede relationsmedlem refererer til" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8759,4 +8759,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12557,9 +12558,9 @@ msgstr "Indstil tilgængelige udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "Download plugins" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Du skal genstarte JOSM for at nogle af ændringerne træder i kraft." @@ -13824,11 +13825,11 @@ msgstr "Åbent rettesæt forventet. Fik lukket rettesæt med ID {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Kode={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14325,14 +14326,18 @@ msgstr "Forbinder til server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "Kunne ikke åbne forbindelse til API {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "" "Kunne ikke forbinde til osm server. Tjek venligst din internetforbindelse." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -15097,11 +15102,11 @@ "konfigurationsproblem. JOSM vil holde op med at virke." -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16619,5 +16624,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Tomt lag" @@ -18676,10 +18681,10 @@ msgstr "Rækkehus" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20709,25 +20714,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Gem WMS-lag" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Navn på menu" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Service" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Lag" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20735,48 +20737,43 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Fejl" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Afgrænsninger" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Tegn ikke linjer mellem punkter for dette lag." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMS-URL" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "Ugyldig URL?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "Kunne ikke importere filer." +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -20898,24 +20895,24 @@ "Dette kan føre til forkerte koordinater." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "Advarsel: WMS-lag deaktiveret på grund af misformet basal URL \"{0}\"" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(deaktiveret)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-lag ({0}) downloader automatisk i zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-lag ({0}) downloader i zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20930,17 +20927,17 @@ "hente WMS-tern alligevel?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "Ja hent billeder" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "Ugyldig URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Download synlige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20949,50 +20946,50 @@ "opløsningen." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Skift opløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Genhent fejlagtige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Alpha-kanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Gem WMS-lag til fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Gem WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Indlæs WMS-lag fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Indlæs WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "WMS-filversion ikke understøttet; fandt {0}, forventede {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Fil format fejl" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Fejl ved indlæsning af fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "Sæt WMS-bogmærke" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Automatisk download" @@ -21010,21 +21007,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Åbn et tomt WMS-lag at indlæse data til fra en fil" @@ -21047,7 +21049,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMS-URL" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -35259,7 +35260,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Angiv et menunavn og en WMS URL" - #~ msgid "Move" #~ msgstr "Flyt" @@ -36609,4 +36607,7 @@ #~ msgstr "Åbn" +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Angiv et menunavn og en WMS URL" + #~ msgid "closedway" #~ msgstr "lukketvej" Index: /applications/editors/josm/i18n/po/de.po =================================================================== --- /applications/editors/josm/i18n/po/de.po (revision 23003) +++ /applications/editors/josm/i18n/po/de.po (revision 23004) @@ -8,6 +8,6 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-09-02 06:16+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-04 22:37+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-09-02 16:54+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -255,5 +255,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -427,5 +427,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -443,5 +443,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -619,10 +619,10 @@ "Reihenfolge gebracht werden)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "{0} Wege verbinden" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Bitte wählen Sie mindestens zwei Wege zum Verbinden." @@ -673,5 +673,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -811,5 +811,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplizieren" @@ -1544,8 +1544,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1604,6 +1604,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Fehler" @@ -1769,5 +1769,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Nein, abbrechen" @@ -3106,5 +3106,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3230,5 +3230,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Doppelter Konflikt" @@ -3591,10 +3591,10 @@ msgstr "Achtung: Fehler beim Speichern der Voreinstellungen in \"{0}\"" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Ungültige Einstellungen in den Zeilen {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3605,5 +3605,5 @@ "Verzeichnis \"{0}\" kein Verzeichnis ist." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3614,5 +3614,5 @@ "\"{0}\" kein Verzeichnis ist." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3623,5 +3623,5 @@ "nicht erstellt werden konnte." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3632,5 +3632,5 @@ "Einstellungsverzeichnis konnte nicht erstellt werden: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3640,5 +3640,5 @@ "Standardeinstellungen." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3649,5 +3649,5 @@ "Standardeinstellungen ersetzt." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3658,5 +3658,5 @@ "konnte nicht auf Standardwerte zurückgesetzt werden: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3668,5 +3668,5 @@ "Standardwerten erzeugt." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3677,10 +3677,10 @@ "konnte nicht auf Standardwerte zurückgesetzt werden: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Fehler: Unerwartete Zeile ''{0}'' in der Lesezeichen-Datei ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4994,5 +4994,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -5010,5 +5010,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5548,5 +5548,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6257,5 +6257,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -6340,5 +6340,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -8189,5 +8189,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8247,27 +8247,27 @@ msgstr "({0}/{1}: Relation ''{2}'' herunterladen..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Merkmale und Elemente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Eltern-Relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Kind-Relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Rolle anwenden:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" "Eine Rolle eingeben und diese auf die gewählten Relationselemente anwenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8279,14 +8279,14 @@ "Sie die zirkuläre Abhängigkeit behandeln?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Objekt entfernen und Verbindung lösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignorieren und die aktuelle Verbindung belassen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8298,9 +8298,9 @@ "

Wollen Sie es ein weiteres Mal in die Relation aufnehmen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Mehrere Elemente verweisen auf das gleiche Objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8313,5 +8313,5 @@ "Relation ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8320,5 +8320,5 @@ "hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8327,5 +8327,5 @@ "hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8335,5 +8335,5 @@ "ausgewählten Element hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8343,20 +8343,20 @@ "ausgewählten Element hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Alle Elemente mit Verweis zu einem der ausgewählten Objekte entfernen" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Relations-Editor: Ausgewählte entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Alle Elemente auswählen, die in der aktuellen Auswahl vorkommen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8367,64 +8367,64 @@ "vorkommen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Objekte für gewählte Relationselemente auswählen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Relationselemente sortieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Sortieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Relations-Editor: Sortieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Die Reihenfolge der Relationselemente umdrehen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Umkehren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Relationseditor: Umkehren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Ausgewählte Elemente nach oben schieben" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Relations-Editor: Nach oben verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Ausgewählte Elemente nach unten schieben" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Relations-Editor: Nach unten verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Das ausgewählte Element aus dieser Relation entfernen" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Relations-Editor: Entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Diese Relation löschen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8436,10 +8436,10 @@ "Relationselemente gelöscht." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Konflikt erstellen und schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" @@ -8447,10 +8447,10 @@ "schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Bearbeitung fortsetzen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" @@ -8458,5 +8458,5 @@ "Relation wiederaufzunehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8468,5 +8468,5 @@ "

Soll ein Konflikt erstellt und der Editor geschlossen werden?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8477,50 +8477,50 @@ "Element
''{1}''.
Bitte lösen Sie diesen Konflikt zunächst auf." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Aktualisierung übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 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:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 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:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Einen leeren Schlüssel hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Alle unvollständigen Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Relations-Editor: Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Ausgewählte unvollständige Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 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:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Rolle anwenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8529,29 +8529,29 @@ msgstr[1] "Eine leere Rolle wird {0} Objekten zugewiesen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 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:1341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 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:1343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Nicht übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Leere Rolle bestätigen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8936,4 +8936,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12173,4 +12174,8 @@ "tries to recover the unsaved changes on next start.)" msgstr "" +"(Das automatische Speichern sichert die geänderten Datenebenen in " +"periodischen Abständen. Die Sicherheitskopien werden in JOSMs " +"Einstellungsverzeichnis gespeichert. Im Falle eines Absturzes versucht JOSM " +"die ungesicherten Änderungen beim nächsten Start wiederherzustellen.)" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72 @@ -12940,9 +12945,9 @@ msgstr "Verfügbare Plugins bearbeiten." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "Plugins herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Einige Einstellungen werden erst nach einem Neustart von JOSM wirksam." @@ -14280,11 +14285,11 @@ "erhalten." -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Kode={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14805,10 +14810,10 @@ msgstr "Serververbindung..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "Verbindung zu API {0} konnte nicht geöffnet werden." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." @@ -14816,4 +14821,8 @@ "Verbindung zum OSM-Server fehlgeschlagen. Bitte prüfen Sie Ihre " "Internetverbindung." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "Lesen des Fehlertextes fehlgeschlagen." #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -15683,5 +15692,5 @@ "schwerwiegendes Konfigurationsproblem." -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" @@ -15689,6 +15698,6 @@ "Warnung: Fehler beim Bearbeiten der Zip-Datei ''{0}''. Fehlermeldung war: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -15968,5 +15977,5 @@ #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69 msgid "Edit time-tag of selected element in a graphical interface" -msgstr "" +msgstr "Zeitangaben des gewählten Elementes graphisch bearbeiten" #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124 @@ -16195,13 +16204,17 @@ " or put the pivot on their common node.\n" msgstr "" +"Bitte zwei Abschnitte ohne gemeinsame Knoten wählen\n" +"oder den Angelpunkt auf den Schnittpunkt legen.\n" #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:82 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93 msgid "AlignWayS: Alignment not possible" -msgstr "" +msgstr "Wege ausrichten: Ausrichten nicht möglich" #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92 msgid "Aligning would result nodes outside the world.\n" msgstr "" +"Das Ausrichten würde Knoten außerhalb des heruntergeladenen Bereiches " +"erzeugen.\n" #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168 @@ -17356,5 +17369,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Leere Ebene" @@ -18817,5 +18830,5 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 msgid "import data from URL" -msgstr "" +msgstr "Daten von URL importieren" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 @@ -19457,10 +19470,10 @@ msgstr "Abteilen" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "OpenSeaMap bearbeiten" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "Seezeicheneditor" @@ -21594,75 +21607,69 @@ msgstr "Nichverzweigenden Sequenz von Wegen auswählen" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "WMS-Ebene speichern" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "Unbenannte WMS-Ebene" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Menüname" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Zufahrtsstraße" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "Service-URL" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Ebenen" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "Ebenen abfragen" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" "so you can not use it. This message will not show again." msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +"Die Ebene unterstützt keine von JOSMs möglichen Projektionen, \n" +"deshalb kann sie nicht benutzt werden. \n" +"Diese Meldung wird nicht noch einmal angezeigt." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "WMS-Fehler" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "Zeige Bereichsgrenzen" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Fehler" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Grenzen" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "Für diese Ebene wurden keine Bereichsgrenzen gefunden." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMS-URL" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "Ungültige URL?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 -#, fuzzy +msgstr "Ungültige Service-URL." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." -msgstr "Erste WMS-Ebene in Liste wählen." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +msgstr "Konnte die Liste der WMS-Ebenen nicht abfragen." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "Erste WMS-Ebene in Liste wählen." +msgstr "Konnte die Liste der WMS-Ebenen nicht auswerten." #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -21784,5 +21791,5 @@ "nicht identisch. Das kann zu falschen Koordinaten führen." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -21791,19 +21798,19 @@ "ungültiges Format hat" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(deaktiviert)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-Ebene ({0}): Automatisches Laden mit Zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-Ebene ({0}): Laden mit Zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -21818,17 +21825,17 @@ "heruntergeladen werden?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "Ja, Kacheln herunterladen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "Ungültige URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Sichtbare Kacheln laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -21837,50 +21844,50 @@ "die Auflösung" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Auflösung ändern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Fehlerhafte Kacheln neu laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Alphakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "WMS-Ebene in Datei speichern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "WMS-Ebene speichern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "WMS-Ebene aus Datei laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "WMS-Ebene laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Dateiformatfehler" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Fehler beim Laden der Datei" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "WMS-Lesezeichen erstellen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Automatisches Laden" @@ -21898,21 +21905,33 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" +"{0} wird funktionieren, aber die Fernsteuerung für das Plugin wurde " +"deaktiviert.\n" +"Die Plugins sollten aktualisiert werden." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" +"Aktuelle Version von ''{1}'': {2}, interne Version {3}- Benötigte Version " +"{4}, interne Version {5}.\n" +"Falls Aktualisieren der Plugins nicht hilft, bitte einen Fehler für ''{0}'' " +"melden." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "{0}: Problem mit Fernbedienung" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Eine leere WMS-Ebene öffnen, um Daten aus einer Datei zu laden" @@ -21935,7 +21954,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMS-URL" +msgstr "WMS-URL hinzufügen" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -24640,10 +24658,10 @@ #: build/trans_presets.java:652 msgid "Rest Area" -msgstr "" +msgstr "Raststelle" #. item "Waypoints/Rest Area" #: build/trans_presets.java:653 msgid "Edit Rest Area" -msgstr "" +msgstr "Raststelle bearbeiten" #. item "Waypoints/Rest Area" text "Name" @@ -26139,5 +26157,5 @@ msgctxt "aerialway" msgid "Goods" -msgstr "" +msgstr "Materialseilbahn" #. item "Aerialway/Goods" @@ -26145,5 +26163,5 @@ msgctxt "aerialway" msgid "Edit Goods" -msgstr "" +msgstr "Materialseilbahn bearbeiten" #. group "Car" @@ -26499,5 +26517,5 @@ #: build/trans_presets.java:1364 msgid "convenience" -msgstr "" +msgstr "Waren des täglichen Bedarfs" #: build/trans_presets.java:1364 @@ -26702,5 +26720,5 @@ #: build/trans_presets.java:1423 msgid "Edit Tyres" -msgstr "" +msgstr "Reifen bearbeiten" #: build/trans_presets.java:1429 build/trans_presets.java:1478 @@ -26851,5 +26869,5 @@ #: build/trans_presets.java:1457 msgid "Edit Motorcycle Parking" -msgstr "" +msgstr "Motorradparkplatz bearbeiten" #. item "Motorcycle/Parking" text "Name" @@ -26867,5 +26885,5 @@ #: build/trans_presets.java:1466 msgid "Edit Shop Motorcycle" -msgstr "" +msgstr "Motorradgeschäft bearbeiten" #: build/trans_presets.java:1472 @@ -29379,19 +29397,19 @@ #: build/trans_presets.java:2460 msgid "Karting" -msgstr "" +msgstr "Kartfahren" #. item "Motorsport/Karting" #: build/trans_presets.java:2461 msgid "Edit Karting" -msgstr "" +msgstr "Kartfahrplatz bearbeiten" #: build/trans_presets.java:2466 msgid "Motocross" -msgstr "" +msgstr "Motocross" #. item "Motorsport/Motocross" #: build/trans_presets.java:2467 msgid "Edit Motocross" -msgstr "" +msgstr "Motocrossgelände bearbeiten" #: build/trans_presets.java:2472 @@ -29402,24 +29420,24 @@ #: build/trans_presets.java:2473 msgid "Edit Safety Training" -msgstr "" +msgstr "Sicherheitstrainingsgebiet bearbeiten" #. #: build/trans_presets.java:2479 msgid "Model Aerodrome" -msgstr "" +msgstr "Modellflugplatz" #. item "Motorsport/Model Aerodrome" #: build/trans_presets.java:2480 msgid "Edit Model Aerodrome" -msgstr "" +msgstr "Modellflugplatz bearbeiten" #: build/trans_presets.java:2485 msgid "RC Car" -msgstr "" +msgstr "Modellauto" #. item "Motorsport/RC Car" #: build/trans_presets.java:2486 msgid "Edit RC Car" -msgstr "" +msgstr "Platz für Motellautos bearbeiten" #: build/trans_presets.java:2493 @@ -36186,18 +36204,18 @@ msgstr "PCN 2006 - Italy" +#~ msgid "Create non-audio markers when reading GPX." +#~ msgstr "Nicht Audio-Marken beim Einlesen von GPX erzeugen." + +#~ msgid "Waterway Point" +#~ msgstr "Gewässerpunkte" + +#~ msgid "football" +#~ msgstr "American Football" + +#~ msgid "Football" +#~ msgstr "American Football" + #~ msgid "Enter a menu name and WMS URL" #~ msgstr "Bitte einen Bezeichner und einen WMS-URL eingeben" - -#~ msgid "Create non-audio markers when reading GPX." -#~ msgstr "Nicht Audio-Marken beim Einlesen von GPX erzeugen." - -#~ msgid "Waterway Point" -#~ msgstr "Gewässerpunkte" - -#~ msgid "football" -#~ msgstr "American Football" - -#~ msgid "Football" -#~ msgstr "American Football" #~ msgid "Degrees Minutes Seconds" Index: /applications/editors/josm/i18n/po/el.po =================================================================== --- /applications/editors/josm/i18n/po/el.po (revision 23003) +++ /applications/editors/josm/i18n/po/el.po (revision 23004) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-04-20 18:36+0000\n" -"Last-Translator: bastik \n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 21:03+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Greek \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-09-02 17:00+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -248,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:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -416,5 +416,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -432,5 +432,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -606,10 +606,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Ένωσε {0} διαδρομές" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Παρακαλώ επιλέξτε τουλάχιστον δυο διαδρομές προς σύνδεση." @@ -660,5 +660,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -799,5 +799,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Αντιγραφή" @@ -1509,8 +1509,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1569,6 +1569,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Σφάλμα" @@ -1733,5 +1733,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Όχι, ακύρωση" @@ -2987,5 +2987,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3109,5 +3109,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Διπλή διένεξη" @@ -3451,10 +3451,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3463,5 +3463,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3470,5 +3470,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3477,5 +3477,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3484,5 +3484,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3490,5 +3490,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3497,5 +3497,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3504,5 +3504,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3511,5 +3511,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3518,10 +3518,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4756,5 +4756,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4772,5 +4772,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5282,5 +5282,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5953,5 +5953,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -6034,5 +6034,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7822,5 +7822,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7877,26 +7877,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +msgid "Apply Role:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 -msgid "Apply Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7905,14 +7905,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7922,9 +7922,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7934,15 +7934,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7950,5 +7950,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7956,20 +7956,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7978,64 +7978,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +msgid "Sort the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 -msgid "Sort the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 +msgid "Reverse the order of the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 -msgid "Reverse the order of the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 msgid "Reverse" msgstr "Αντιστροφή" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Μετακίνηση των επιλεγμένων μελών πάνω" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Μετακίνηση των επιλεγμένων μελών κάτω" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8044,23 +8044,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8069,5 +8069,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8076,50 +8076,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 +msgid "Download all incomplete members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 -msgid "Download all incomplete members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Λήψη μελών" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +msgid "Sets a role for the selected members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 -msgid "Sets a role for the selected members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8128,29 +8128,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8519,4 +8519,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12144,9 +12145,9 @@ msgstr "Ρύθμιση διαθέσιμων πρόσθετων." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Πρέπει να επανεκινήσετε το JOSM για να εφαρμοστούν κάποιες ρυθμίσεις." @@ -13362,11 +13363,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -13838,10 +13839,10 @@ msgstr "Επικοινωνία με τον Διακομιστή..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." @@ -13849,4 +13850,8 @@ "Aδύνατη η σύνδεση με τον OSM server.Παρακαλω ελέγξτε την σύνδεση σας στο " "Internet." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14583,11 +14588,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16092,5 +16097,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Άδειο επίπεδο" @@ -18148,10 +18153,10 @@ msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20149,25 +20154,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Αποθήκευση επιπέδου WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Όνομα μενού" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Υπηρεσίες" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Επίπεδα" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20175,45 +20177,41 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Σφάλμα" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Δε Βρέθηκε" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "Μη έγκυρο όνομα χρήστη" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." msgstr "" @@ -20330,24 +20328,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20358,17 +20356,17 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Λήψη εμφανών πλακιδίων" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20376,50 +20374,50 @@ "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Αλλαγή ανάλυσης" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Ανανέωση λανθασμένων πλακιδίων" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Κανάλι άλφα" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Αποθ'ηκευση επιπέδου WMS σε αρχείο" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Αποθήκευση επιπέδου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Φόρτωση επιπέδου WMS από αρχείο" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Φόρτωση επιπέδου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Σφάλμα μορφής αρχείου" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Σφάλμα φόρτωσης αρχείου" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Αυτόματη λήψη" @@ -20437,21 +20435,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Άνοιγμα ενός κενού επιπέδου WMS για φόρτωση δεδομένων από ένα αρχείο" @@ -20476,7 +20479,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMS URL" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -34653,7 +34655,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Εισάγετε ένα όνομα μενού και ένα WMS URL" - #~ msgid "" #~ "The plugin could not be removed. Please tell the people you got JOSM from " @@ -35088,4 +35087,7 @@ #~ msgstr "Σφάλμα κατά την αίτηση ενημέρωσης" +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Εισάγετε ένα όνομα μενού και ένα WMS URL" + #~ msgid "Please select the row to copy." #~ msgstr "Παρακαλώ επιλέξτε την γραμμή προς αντιγραφή" Index: /applications/editors/josm/i18n/po/en_AU.po =================================================================== --- /applications/editors/josm/i18n/po/en_AU.po (revision 23003) +++ /applications/editors/josm/i18n/po/en_AU.po (revision 23004) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" "PO-Revision-Date: 2010-06-15 17:47+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-09-02 16:56+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -254,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:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -424,5 +424,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -440,5 +440,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -616,10 +616,10 @@ "nodes)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Combine {0} ways" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Please select at least two ways to combine." @@ -670,5 +670,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -808,5 +808,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplicate" @@ -1528,8 +1528,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1588,6 +1588,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Error" @@ -1753,5 +1753,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "No, abort" @@ -3040,5 +3040,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3164,5 +3164,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Double conflict" @@ -3513,10 +3513,10 @@ msgstr "Warning: failed to persist preferences to ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Malformed config file at lines {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3527,5 +3527,5 @@ "not a directory." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3536,5 +3536,5 @@ "not a directory." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3545,5 +3545,5 @@ "preference directory: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3554,5 +3554,5 @@ "preference directory: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3561,5 +3561,5 @@ "Warning: Missing preference file ''{0}''. Creating a default preference file." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3570,5 +3570,5 @@ "file." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3579,5 +3579,5 @@ "to default: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3588,5 +3588,5 @@ "
and creating a new default preference file." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3597,10 +3597,10 @@ "default: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4878,5 +4878,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4894,5 +4894,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5424,5 +5424,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6117,5 +6117,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 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" @@ -6198,5 +6198,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -8026,5 +8026,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8083,26 +8083,26 @@ msgstr "({0}/{1}): Downloading relation ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Tags and Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Parent Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Child Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Apply Role:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Enter a role and apply it to the selected relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8114,14 +8114,14 @@ "
How do you want to proceed with circular dependencies?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Remove them, clean up relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignore them, leave relation as is" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8134,9 +8134,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Multiple members referring to same primitive" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8149,5 +8149,5 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8155,5 +8155,5 @@ "Add all primitives selected in the current dataset before the first member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8161,5 +8161,5 @@ "Add all primitives selected in the current dataset after the last member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8169,5 +8169,5 @@ "member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8177,15 +8177,15 @@ "member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Remove all members referring to one of the selected primitives" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Relation Editor: Remove Selected" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -8193,5 +8193,5 @@ "Select relation members which refer to primitives in the current selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8202,64 +8202,64 @@ "selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Select primitives for selected relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Sort the relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Sort" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Relation Editor: Sort" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Reverse the order of the relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Reverse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Relation Editor: Reverse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Move the currently selected members up" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Relation Editor: Move Up" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Move the currently selected members down" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Relation Editor: Move Down" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Remove the currently selected members from this relation" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Relation Editor: Remove" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Delete the currently edited relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8271,23 +8271,23 @@ "was open. They have been removed from the relation members list." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Yes, create a conflict and close" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 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:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "No, continue editing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 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:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8299,5 +8299,5 @@ "conflict and close the editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8308,50 +8308,50 @@ "
Please resolve this conflict first, then try again." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Apply the current updates" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Apply the updates and close the dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Cancel the updates and close the dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Add an empty tag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Download all incomplete members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Relation Editor: Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Download selected incomplete members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 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:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Apply Role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8360,29 +8360,29 @@ msgstr[1] "You are setting an empty role on {0} primitives." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 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:1341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 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:1343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Yes, apply it" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "No, do not apply" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Confirm empty role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Edit the relation the currently selected relation member refers to" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8756,4 +8756,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12652,9 +12653,9 @@ msgstr "Configure available plug-ins." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "Download plug-ins" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "You have to restart JOSM for some settings to take effect." @@ -13938,11 +13939,11 @@ msgstr "Open changeset expected. Got closed changeset with id {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Code={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14442,14 +14443,18 @@ msgstr "Contacting Server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "Failed to open connection to API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "" "Could not connect to the OSM server. Please check your internet connection." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -15292,11 +15297,11 @@ "problem. JOSM will stop working." -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "Warning: failed to handle zip file ''{0}''. Exception was: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16862,5 +16867,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Blank Layer" @@ -18929,10 +18934,10 @@ msgstr "Terrace" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20955,25 +20960,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Save WMS layer" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Menu Name" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Service" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Layers" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20981,48 +20983,43 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Error" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Bounds" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Do not draw lines between points for this layer." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "Invalid URL?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "Could not import files." +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -21145,24 +21142,24 @@ "This may lead to wrong coordinates." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "Warning: WMS layer deactivated because of malformed base url ''{0}''" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(deactivated)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS layer ({0}), automatically downloading in zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS layer ({0}), downloading in zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -21177,17 +21174,17 @@ "tiles anyway?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "Yes, fetch images" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "Invalid URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Download visible tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -21195,50 +21192,50 @@ "The requested area is too big. Please zoom in a little, or change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Reload erroneous tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Save WMS layer to file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Save WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Load WMS layer from file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Load WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Unsupported WMS file version; found {0}, expected {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "File Format Error" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Error loading file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "Set WMS Bookmark" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Automatic downloading" @@ -21256,21 +21253,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Open a blank WMS layer to load data from a file" @@ -21293,7 +21295,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMS URL" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -35516,7 +35517,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Enter a menu name and WMS URL" - #~ msgid "The selected way does not contain the selected node." #~ msgid_plural "The selected way does not contain all the selected nodes." @@ -35801,4 +35799,7 @@ #~ msgstr "Check if map painting found data errors." +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Enter a menu name and WMS URL" + #~ msgid "Bikes" #~ msgstr "Bikes" Index: /applications/editors/josm/i18n/po/en_GB.po =================================================================== --- /applications/editors/josm/i18n/po/en_GB.po (revision 23003) +++ /applications/editors/josm/i18n/po/en_GB.po (revision 23004) @@ -11,6 +11,6 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-05-16 13:46+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 22:13+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: German \n" @@ -19,5 +19,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-09-02 16:57+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -73,7 +73,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -89,5 +89,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -257,5 +257,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -427,5 +427,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -443,5 +443,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -619,10 +619,10 @@ "nodes)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Combine {0} ways" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Please select at least two ways to combine." @@ -673,5 +673,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -811,5 +811,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplicate" @@ -1531,8 +1531,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1591,6 +1591,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Error" @@ -1756,5 +1756,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "No, abort" @@ -3043,5 +3043,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3167,5 +3167,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Double conflict" @@ -3516,10 +3516,10 @@ msgstr "Warning: failed to persist preferences to ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Malformed config file at lines {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3530,5 +3530,5 @@ "not a directory." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3539,5 +3539,5 @@ "not a directory." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3548,5 +3548,5 @@ "preference directory: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3557,5 +3557,5 @@ "preference directory: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3564,5 +3564,5 @@ "Warning: Missing preference file ''{0}''. Creating a default preference file." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3573,5 +3573,5 @@ "file." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3582,5 +3582,5 @@ "to default: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3591,5 +3591,5 @@ "
and creating a new default preference file." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3600,10 +3600,10 @@ "default: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4881,5 +4881,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4897,5 +4897,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5427,5 +5427,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6120,5 +6120,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 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" @@ -6201,5 +6201,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -8037,5 +8037,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8094,26 +8094,26 @@ msgstr "({0}/{1}): Downloading relation ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Tags and Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Parent Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Child Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Apply Role:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Enter a role and apply it to the selected relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8125,14 +8125,14 @@ "
How do you want to proceed with circular dependencies?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Remove them, clean up relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignore them, leave relation as is" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8145,9 +8145,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Multiple members referring to same primitive" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8160,5 +8160,5 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8166,5 +8166,5 @@ "Add all primitives selected in the current dataset before the first member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8172,5 +8172,5 @@ "Add all primitives selected in the current dataset after the last member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8180,5 +8180,5 @@ "member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8188,15 +8188,15 @@ "member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Remove all members referring to one of the selected primitives" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Relation Editor: Remove Selected" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -8204,5 +8204,5 @@ "Select relation members which refer to primitives in the current selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8213,64 +8213,64 @@ "selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Select primitives for selected relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Sort the relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Sort" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Relation Editor: Sort" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Reverse the order of the relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Reverse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Relation Editor: Reverse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Move the currently selected members up" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Relation Editor: Move Up" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Move the currently selected members down" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Relation Editor: Move Down" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Remove the currently selected members from this relation" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Relation Editor: Remove" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Delete the currently edited relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8282,23 +8282,23 @@ "was open. They have been removed from the relation members list." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Yes, create a conflict and close" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 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:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "No, continue editing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 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:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8310,5 +8310,5 @@ "conflict and close the editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8319,50 +8319,50 @@ "
Please resolve this conflict first, then try again." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Apply the current updates" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Apply the updates and close the dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Cancel the updates and close the dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Add an empty tag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Download all incomplete members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Relation Editor: Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Download selected incomplete members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 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:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Apply Role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8371,29 +8371,29 @@ msgstr[1] "You are setting an empty role on {0} primitives." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 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:1341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 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:1343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Yes, apply it" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "No, do not apply" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Confirm empty role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Edit the relation the currently selected relation member refers to" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8767,4 +8767,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12665,9 +12666,9 @@ msgstr "Configure available plug-ins." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "Download plug-ins" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "You have to restart JOSM for some settings to take effect." @@ -13951,11 +13952,11 @@ msgstr "Open changeset expected. Got closed changeset with id {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Code={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14455,14 +14456,18 @@ msgstr "Contacting Server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "Failed to open connection to API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "" "Could not connect to the OSM server. Please check your internet connection." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -15313,11 +15318,11 @@ "problem. JOSM will stop working." -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "Warning: failed to handle zip file ''{0}''. Exception was: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16885,5 +16890,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Blank Layer" @@ -18952,10 +18957,10 @@ msgstr "Terrace" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20998,25 +21003,22 @@ msgstr "Select non-branching sequences of ways" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Save WMS layer" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Menu Name" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Service" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Layers" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -21024,48 +21026,43 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Error" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Bounds" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Do not draw lines between points for this layer." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "Invalid URL?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "Could not import files." +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -21188,24 +21185,24 @@ "This may lead to wrong coordinates." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "Warning: WMS layer deactivated because of malformed base url ''{0}''" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(deactivated)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS layer ({0}), automatically downloading in zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS layer ({0}), downloading in zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -21220,17 +21217,17 @@ "tiles anyway?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "Yes, fetch images" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "Invalid URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Download visible tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -21238,50 +21235,50 @@ "The requested area is too big. Please zoom in a little, or change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Reload erroneous tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Save WMS layer to file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Save WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Load WMS layer from file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Load WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Unsupported WMS file version; found {0}, expected {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "File Format Error" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Error loading file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "Set WMS Bookmark" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Automatic downloading" @@ -21299,21 +21296,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Open a blank WMS layer to load data from a file" @@ -21336,7 +21338,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMS URL" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -35561,7 +35562,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Enter a menu name and WMS URL" - #~ msgid "Move" #~ msgstr "Move" @@ -36087,4 +36085,7 @@ #~ msgid "Please select the row to copy." #~ msgstr "Please select the row to copy." + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Enter a menu name and WMS URL" #~ msgid "Copy Default" Index: /applications/editors/josm/i18n/po/es.po =================================================================== --- /applications/editors/josm/i18n/po/es.po (revision 23003) +++ /applications/editors/josm/i18n/po/es.po (revision 23004) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-09-02 08:29+0000\n" -"Last-Translator: Emilio Gomez Fernandez \n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-04 21:14+0000\n" +"Last-Translator: Emilien Klein \n" "Language-Team: Spanish \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-09-02 16:54+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -257,5 +257,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -426,5 +426,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -442,5 +442,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -618,10 +618,10 @@ "única de nodos)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Combinar {0} vías" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Por favor seleccione al menos dos vías a combinar" @@ -672,5 +672,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -813,5 +813,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplicar" @@ -1558,8 +1558,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1618,6 +1618,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Error" @@ -1625,5 +1625,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:54 msgid "Reverse way" -msgstr "" +msgstr "Via Inversa" #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:67 @@ -1784,5 +1784,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "No, abortar" @@ -3112,5 +3112,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3236,5 +3236,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Doble conflicto" @@ -3592,10 +3592,10 @@ msgstr "Atención: fallo al almacenar las preferencias en \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Archivo de configuración malformado en las lineas {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3606,5 +3606,5 @@ "preferencias ''{0}'' no es un directorio." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3615,5 +3615,5 @@ "preferencias ''{0}'' no es un directorio." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3624,5 +3624,5 @@ "de preferencias desaparecido: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3633,5 +3633,5 @@ "directorio de preferencias desaparecido: {0}." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3641,5 +3641,5 @@ "preferencias por defecto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3650,5 +3650,5 @@ "archivo por defecto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3659,5 +3659,5 @@ "archivo de preferencias por defecto:{0}." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3669,5 +3669,5 @@ "defecto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3678,10 +3678,10 @@ "de preferencias por defecto. {0}." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Error: Línea ''{0}'' inesperada en el archivo de marcapáginas ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4122,9 +4122,9 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442 msgid "South" -msgstr "" +msgstr "Sur" #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446 msgid "Hemisphere" -msgstr "" +msgstr "Hemisferio" #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455 @@ -4987,5 +4987,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -5003,5 +5003,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5560,5 +5560,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6270,5 +6270,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 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." @@ -6351,5 +6351,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -8213,5 +8213,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8271,26 +8271,26 @@ msgstr "({0}/{1}): Descargando relación ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Etiquetas y miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Relaciones padre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Relaciones hijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Aplicar función:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Inserte un papel y aplicalo a las relaciones de miembros seleccionadas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8302,14 +8302,14 @@ "
¿Desea continuar con dependencias circulares?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Eliminarlos, limpiar la relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignorarlos, dejar la relación como está" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8321,9 +8321,9 @@ "''{0}''

¿Desea realmente añadir otro miembro relacionado?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Miembros múltiples referenciando a la misma primitiva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8336,5 +8336,5 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8343,5 +8343,5 @@ "del primer miembro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8350,5 +8350,5 @@ "del último miembro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8358,5 +8358,5 @@ "del primer miembro seleccionado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8366,5 +8366,5 @@ "del último miembro seleccionado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" @@ -8373,10 +8373,10 @@ #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Editor de relaciones: Cancelar selección" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -8385,5 +8385,5 @@ "la selección actual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8394,64 +8394,64 @@ "la selección actual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Seleccionar primitivas para la relación de miembros señalada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Ordenar los miembros de la relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Ordenar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Editor de relaciones: Ordenar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Invertir el orden de los miembros de la relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Invertir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Editor de relaciones: Invertir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Mover los miembro(s) seleccionos hacia arriba" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Editor de relaciones: Mover arriba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Mover los miembros seleccionados hacia abajo" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Editor de relaciones: Mover abajo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Quitar los miembros seleccionados de esta relación" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Editor de relaciones: Borrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Eliminar esta relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8464,19 +8464,19 @@ "relación." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Sí, crear un conflicto y cerrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Haga click para crear un conflicto y cerrar este editor de relaciones" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "No, continuar editando" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" @@ -8484,5 +8484,5 @@ "relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8494,5 +8494,5 @@ "el editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8503,50 +8503,50 @@ "necesario resolver el conflicto antes de continuar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Aplicar las actualizaciones actuales" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 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:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 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:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Añadir una etiqueta vacía" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Descargar todos los miembros incompletos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Descargar miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Editor de Relaciones: Descargar Miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Descargar los miembros incompletos seleccionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 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:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Aplicar función" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8555,25 +8555,25 @@ msgstr[1] "Está configurando reles vacíos en las primitivas {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Esto equivale a borrar los roles de esas primitivas." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "¿Quiere aplicar el nuevo rol?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Sí, aplícalo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "No, no lo apliques" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Confirmar función vacía" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8581,5 +8581,5 @@ "referida a" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8962,4 +8962,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12971,9 +12972,9 @@ msgstr "Configurar los complementos disponibles." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "Descargar componentes" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Debes reiniciar JOSM para que las preferencias tengan efecto" @@ -13604,4 +13605,6 @@ "be the same as in values" msgstr "" +"Tag predeterminado Erroneo \"{0}-{1}\" - número de elementos en " +"display_values debe ser el mismo presente en values" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:500 @@ -14302,11 +14305,11 @@ "cambios con id {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Código={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14829,10 +14832,10 @@ msgstr "Contactando con el servidor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "Fallo al abrir la conexión de la API {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." @@ -14840,4 +14843,8 @@ "No se ha podido conectar con el servidor OSM. Por favor, verifique su " "conexión a Internet." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "Fallo la lectura del texto de error." #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -15702,5 +15709,5 @@ "configuración. JOSM dejará de trabajar." -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" @@ -15708,6 +15715,6 @@ "Advertencia: Fallo al manipular fichero zip \"{0}\". La excepción fue: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16029,5 +16036,5 @@ #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191 msgid "open end" -msgstr "" +msgstr "terminación accesible" #. @@ -16618,5 +16625,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" -msgstr "" +msgstr "Seleccionar Feuille" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:157 @@ -16647,5 +16654,5 @@ #, java-format msgid "Lambert CC9 Zone {0} cache file (.CC{0})" -msgstr "" +msgstr "Lambert CC9 Zone {0} cache file (.CC{0})" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 @@ -16715,4 +16722,8 @@ "Would you like to restore F11 for grab action ?" msgstr "" +"Plugin cadestre-fr usado tradicionalmente para detectar el acceso directo " +"del teclado F11\n" +"que esta asignado en este momento para el cambio a pantalla completa\n" +"Desea restaurar la tecla F11 para la ejectuar la acción TOMAR?" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 @@ -16757,5 +16768,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Use \"Tableau d''assemblage\"" -msgstr "" +msgstr "Usar \"Tableau d''assemblage\"" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 @@ -17070,5 +17081,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" -msgstr "" +msgstr "Multiplicador de toma de Imágenes tipo Raster" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 @@ -17080,5 +17091,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" -msgstr "" +msgstr "Muestre piezas cruzadas" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 @@ -17234,5 +17245,5 @@ "Click first Lambert crosspiece for georeferencing\n" "(two points required)" -msgstr "" +msgstr "Haga click en la primera Pieza cruzada Lambert para Georeferenciar" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:226 @@ -17243,5 +17254,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:244 msgid "Click second Lambert crosspiece for georeferencing" -msgstr "" +msgstr "Haga click en la segunda Pieza cruzada Lambert para Georeferenciar" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:275 @@ -17387,5 +17398,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Capa vacía" @@ -17516,9 +17527,9 @@ #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 msgid "Download along..." -msgstr "" +msgstr "Descarga con ..." #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 msgid "Download OSM data along the selected ways." -msgstr "" +msgstr "Descargar datos OSM con zonas aledañas a las vías seleccionadas." #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 @@ -17528,5 +17539,5 @@ #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 msgid "Please select 1 or more ways to download along" -msgstr "" +msgstr "Por favor seleccione una o más vías para descargar" #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 @@ -18271,5 +18282,5 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" -msgstr "" +msgstr "Izquierda Michigan" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 @@ -18810,5 +18821,5 @@ #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:430 msgid "Meta" -msgstr "" +msgstr "Meta" #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:74 @@ -19368,5 +19379,5 @@ #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:86 msgid "Terrace a house" -msgstr "" +msgstr "Designe una Casa como de tipo Abierto" #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151 @@ -19385,5 +19396,5 @@ #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:159 msgid "Lowest housenumber of the terraced house" -msgstr "" +msgstr "Número más bajo de la casa abierta" #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:161 @@ -19480,10 +19491,10 @@ msgstr "Edificios entre medianeras" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "Editar OpenSeaMap" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "Editor de marcas marinas" @@ -19602,9 +19613,9 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:167 msgid "Move the selected relation members down by one position" -msgstr "" +msgstr "Mover los miembros de relación seleccionados una posición abajo" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:194 msgid "Move the selected relation members up by one position" -msgstr "" +msgstr "Mover los miembros de relación seleccionados una posición arriba" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:134 @@ -19884,9 +19895,9 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:177 msgid "Move the selected vias down by one position" -msgstr "" +msgstr "Mover las vías seleccionadas una posición abajo" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:203 msgid "Move the selected vias up by one position" -msgstr "" +msgstr "Mover las vías seleccionadas una posición arriba" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:231 @@ -20803,5 +20814,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:153 msgid "" -msgstr "" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 @@ -21469,13 +21480,13 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262 msgid "no deinterlacing" -msgstr "" +msgstr "No deinterlacing" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270 msgid "deinterlacing using line doubling" -msgstr "" +msgstr "deinterlacing usando line doubling" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278 msgid "deinterlacing using linear interpolation" -msgstr "" +msgstr "deinterlacing usando interpolación linear" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:109 @@ -21623,25 +21634,22 @@ msgstr "Seleccionar secuencias de vías que no se bifurquen" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Salvar capa WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "Capa WMS sin nombre" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Nombre del menú" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Vía de servicio" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "URL del servicio" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Capas" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -21649,49 +21657,43 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "Error del WMS" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "Mostrar los limites" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Error" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Límites" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "No dibujar líneas entre puntos para esta capa" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "Dirección URL del servicio WMS" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "¿URL no válida?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 -#, fuzzy +msgstr "URL del servicio invalida." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." -msgstr "Seleccione primero la capa WMS de la lista" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +msgstr "No se pudo recuperar la lista de las capas WMS." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "Seleccione primero la capa WMS de la lista" +msgstr "No se pudo analizar la lista de las capas WMS." #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -21814,5 +21816,5 @@ "Esto puede dar lugar a unas coordenadas erróneas." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -21821,19 +21823,19 @@ "''{0}''" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(desactivado)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Capa WMS ({0}) descargándose automáticamente en el zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Capa WMS ({0}), descargando en zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -21848,17 +21850,17 @@ "teselas WMS de todos modos?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "Sí, descargar las imágenes" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "¿URL no válida?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Descargar las teselas visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -21867,50 +21869,50 @@ "más, o cambie la resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Cambiar resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Recargar teselas erróneas" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Canal alfa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Guardar capa WMS como archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Salvar capa WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Cargar capa WMS desde archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Cargar capa WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Versión de archivo WMS no soportada; encontrada {0}, esperada {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Error en el formato del archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Error al leer el archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "Fijar marcador WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Descarga automática" @@ -21928,26 +21930,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" -"{0} funcionará pero el control remoto está deshabilitado.\n" -"Versión actual de \"{1}\": {2}, versión interna {3}. Se requiere la versión " -"{4}, versión interna {5}.\n" -"Debería actualizar los plugins. Si no se soluciona reporte un fallo para " -"\"{0}\"." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "{0}: Problema con control remoto" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Abrir una capa WMS en blanco para cargar datos desde un archivo" @@ -21975,7 +21977,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "Dirección URL del servicio WMS" +msgstr "Añadir la url del WMS" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -22167,5 +22168,5 @@ #: build/specialmessages.java:31 msgid "Abort file chooser dialog" -msgstr "" +msgstr "Cancelar el diálogo de elección de archivo" #. Strings in JFileChooser @@ -36245,7 +36246,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Introduce un nombre y una dirección para el servicio WMS" - #~ msgid "Move" #~ msgstr "Mover" @@ -36728,4 +36726,7 @@ #~ msgid "Malformed sentences: " #~ msgstr "Sentencias mal formadas: " + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Introduce un nombre y una dirección para el servicio WMS" #~ msgid "Copy Default" @@ -38109,2 +38110,15 @@ #~ msgid "Building tag:" #~ msgstr "Etiqueta de edificación" + +#~ msgid "" +#~ "{0} will work but remote control is disabled.\n" +#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " +#~ "internal version {5}.\n" +#~ "You should update the plugins. If this does not help report a bug for " +#~ "\"{0}\"." +#~ msgstr "" +#~ "{0} funcionará pero el control remoto está deshabilitado.\n" +#~ "Versión actual de \"{1}\": {2}, versión interna {3}. Se requiere la " +#~ "versión {4}, versión interna {5}.\n" +#~ "Debería actualizar los plugins. Si no se soluciona reporte un fallo para " +#~ "\"{0}\"." Index: /applications/editors/josm/i18n/po/et.po =================================================================== --- /applications/editors/josm/i18n/po/et.po (revision 23003) +++ /applications/editors/josm/i18n/po/et.po (revision 23004) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-09-01 15:33+0000\n" -"Last-Translator: Mihkel Anni \n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-05 18:20+0000\n" +"Last-Translator: Margus Värton \n" "Language-Team: Estonian \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-09-02 16:53+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -252,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:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -420,5 +420,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -436,5 +436,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -610,10 +610,10 @@ msgstr "Ei saa teid ühendada. Ei saa liita üheks sõlmejadaks." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Ühenda {0} teed." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Palun vali vähemalt kaks teed, mida sobitada." @@ -664,5 +664,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -802,5 +802,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Kahekordista" @@ -1436,5 +1436,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60 msgid "Purge..." -msgstr "" +msgstr "Eemalda..." #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60 @@ -1445,5 +1445,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166 msgid "Purge" -msgstr "" +msgstr "Eemalda" #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166 @@ -1463,4 +1463,5 @@ "selected objects:" msgstr "" +"Lisaks valitud objektidele eemaldatakse
järgmised sõltuvad objektid:" #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230 @@ -1506,8 +1507,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1566,6 +1567,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Viga" @@ -1729,5 +1730,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Ei, katkesta" @@ -2509,5 +2510,5 @@ "Really move them?" msgstr "" -"Sa liigutasid rohkem, kui {0} elementi. Suure arvu elementide liigutamine on " +"Sa liigutasid rohkem kui {0} elementi. Suure arvu elementide liigutamine on " "sageli eksitus.\n" "Kas liigutame neid elemente?" @@ -2970,5 +2971,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3092,5 +3093,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3236,6 +3237,6 @@ msgid "Purged {0} object" msgid_plural "Purged {0} objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Eemaldatud {0} objekt" +msgstr[1] "Eemaldatud {0} objekti" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 @@ -3431,10 +3432,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3443,5 +3444,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3450,5 +3451,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3457,5 +3458,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3464,5 +3465,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3470,5 +3471,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3477,5 +3478,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3484,5 +3485,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3491,5 +3492,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3498,10 +3499,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -3959,5 +3960,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64 msgid "Do not show again (remembers choice)" -msgstr "" +msgstr "Ära seda teadet rohkem näita (valik jäetakse meelde)" #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 @@ -4738,5 +4739,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4754,5 +4755,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5261,5 +5262,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5931,5 +5932,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -6012,5 +6013,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7797,5 +7798,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7852,26 +7853,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +msgid "Apply Role:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 -msgid "Apply Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7880,14 +7881,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7897,9 +7898,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7909,15 +7910,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7925,5 +7926,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7931,20 +7932,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7953,64 +7954,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +msgid "Sort the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 -msgid "Sort the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 +msgid "Reverse the order of the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 -msgid "Reverse the order of the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Liiguta hetkel valitud liiget ülespoole" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Liiguta hetkel valitud liiget allapoole" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8019,23 +8020,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8044,5 +8045,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8051,50 +8052,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Rakenda jooksvad uuendused" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 +msgid "Download all incomplete members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 -msgid "Download all incomplete members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Lae alla liikmed" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +msgid "Sets a role for the selected members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 -msgid "Sets a role for the selected members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8103,29 +8104,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8490,4 +8491,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -9006,4 +9008,6 @@ "and a valid password." msgstr "" +"OSM API ''{0}'' autentimine ebaõnnestus. Palun sisesta kehtiv kasutajanimi " +"ja salasõna." #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 @@ -9025,4 +9029,6 @@ "username and a valid password." msgstr "" +"HTTP vahendaja ''{0}'' autentimine ebaõnnestus. Palun sisesta kehtiv " +"kasutajanimi ja salasõna." #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259 @@ -9038,5 +9044,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 msgid "Authenticate with the supplied username and password" -msgstr "" +msgstr "Autentimine määratud kasutajanime ja salasõnaga." #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 @@ -12094,9 +12100,9 @@ msgstr "Saadaolevate lIsandprogrammide konfigureerimine." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Muudatuste rakendumiseks pead JOSMi taaskäivitama." @@ -12462,4 +12468,5 @@ "Select to use HTTP basic authentication with your OSM username and password" msgstr "" +"Sel viisil valid HTTP algtaseme autentimise OSM kasutajanime ja salasõnaga." #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67 @@ -12480,5 +12487,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54 msgid "OSM username:" -msgstr "" +msgstr "OSM kasutajanimi:" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67 @@ -12493,4 +12500,9 @@ "server. Do not use a valuable password.

" msgstr "" +"

Hoiatus: Parooli " +"säilitatakse JOSM eelistuste failis lahtise tekstina. Enamgi veel - see " +"edastatakse iga OSM serverile esitatud päringuga krüpteerimata " +"kujul. Ärge kasutage väärtuslikku parooli.

" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:117 @@ -13310,11 +13322,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -13786,13 +13798,17 @@ msgstr "Ühendun serveriga..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "Ei saanud ühendust OSM serveriga. Kontrollige oma interneti-ühendust." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14522,11 +14538,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -14758,5 +14774,5 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:385 msgid "No username provided." -msgstr "" +msgstr "Kasutajanimi on määramata." #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:388 @@ -16024,5 +16040,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Tühi kiht" @@ -18059,10 +18075,10 @@ msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20054,25 +20070,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Nimeta kiht ümber." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Teenindus" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Kihid" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20080,43 +20093,41 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Viga" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -msgid "Show Bounds" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Selles alas ei leitud andmeid." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." msgstr "" @@ -20233,24 +20244,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20261,67 +20272,67 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "" @@ -20339,21 +20350,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Ava tühi WMS kiht andmete laadimiseks failist" @@ -27404,15 +27420,15 @@ #: build/trans_presets.java:2260 msgid "Canoeing" -msgstr "" +msgstr "Kanuusõit" #. item "Sport/Canoeing" #: build/trans_presets.java:2261 msgid "Edit Canoeing" -msgstr "" +msgstr "Kanuusõidu muutmine" #. item "Sport/Cycling" #: build/trans_presets.java:2267 msgid "Edit Cycling" -msgstr "" +msgstr "Jalgrattasõidu muutmine" #: build/trans_presets.java:2272 @@ -27427,10 +27443,10 @@ #: build/trans_presets.java:2278 msgid "Equestrian" -msgstr "" +msgstr "Ratsasport" #. item "Sport/Equestrian" #: build/trans_presets.java:2279 msgid "Edit Equestrian" -msgstr "" +msgstr "Ratsaspordi muutmine" #: build/trans_presets.java:2284 Index: /applications/editors/josm/i18n/po/eu.po =================================================================== --- /applications/editors/josm/i18n/po/eu.po (revision 23003) +++ /applications/editors/josm/i18n/po/eu.po (revision 23004) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" "PO-Revision-Date: 2010-07-06 17:47+0000\n" "Last-Translator: Mikel Lizarralde \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-09-02 16:57+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -258,5 +258,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -428,5 +428,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -444,5 +444,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -619,10 +619,10 @@ "Ezin izan dira bideak elkartu (ezin izan dira nodo kate bakar batean batu)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "{0} bideak bateratu" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Aukeratu bateratzeko bi bide gutxienez." @@ -673,5 +673,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -814,5 +814,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Bikoiztu" @@ -1553,8 +1553,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1613,6 +1613,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Errorea" @@ -1779,5 +1779,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Ez, bertan behera utzi" @@ -3112,5 +3112,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3237,5 +3237,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Gatazka bikoitza" @@ -3586,10 +3586,10 @@ msgstr "Kontuz: huts egin du hobespenak ''{0}'' gordetzean" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Konfigurazio fitxategian malformazioa {0} lerroetan" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3600,5 +3600,5 @@ "ez da direktorio bat." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3609,5 +3609,5 @@ "direktorioa ez da direktorio bat." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3618,5 +3618,5 @@ "hobespen direktorioa sortzean: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3627,5 +3627,5 @@ "hobespenen direktorioa sortzean: {0}." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3635,5 +3635,5 @@ "fitxategi bat sortzen." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3644,5 +3644,5 @@ "fitxategiagatik." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3653,5 +3653,5 @@ "fitxategia jatorrizkora berrezartzeak: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3662,5 +3662,5 @@ "da
{0}
n eta lehenetsitako hobespen fitxategia sortzen." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3671,10 +3671,10 @@ "fitxategia berrabiaraztean huts egin du: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Errorea: Espero ez zen ''{0}'' lerroa laster-marka honetan ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4963,5 +4963,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4979,5 +4979,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5511,5 +5511,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6182,5 +6182,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Erlazio honen kopia bat sortu eta beste edizio-leiho batean ireki" @@ -6263,5 +6263,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -8048,5 +8048,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8103,26 +8103,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Etiketak eta partaideak" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Guraso-erlazioak" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +msgid "Apply Role:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 -msgid "Apply Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8131,14 +8131,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8148,9 +8148,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8160,15 +8160,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8176,5 +8176,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8182,20 +8182,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8204,64 +8204,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +msgid "Sort the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 -msgid "Sort the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 msgid "Sort" msgstr "Ordenatu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 +msgid "Reverse the order of the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 -msgid "Reverse the order of the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 msgid "Reverse" msgstr "Alderantzikatu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8270,23 +8270,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8295,5 +8295,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8302,50 +8302,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 +msgid "Download all incomplete members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 -msgid "Download all incomplete members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +msgid "Sets a role for the selected members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 -msgid "Sets a role for the selected members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8354,29 +8354,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8740,4 +8740,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12342,9 +12343,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -13556,11 +13557,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14032,12 +14033,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." msgstr "" @@ -14768,11 +14773,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16263,5 +16268,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Geruza garbia" @@ -18298,10 +18303,10 @@ msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20313,25 +20318,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Gorde WMS geruza" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Menu-izena" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Zerbitzu-bidea" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Geruzak" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20339,45 +20341,41 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Errorea" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Ez da aurkitu" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Daturik ez da azalera honetan topatu." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMSaren URL helbidea" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "URL desegokia?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." msgstr "" @@ -20499,5 +20497,5 @@ "Koordenatu okerretara eraman gaitzake honek." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -20505,19 +20503,19 @@ "Kontuz: WMS geruza desaktibatu egin da \"{0}\" URLaren malformazioagatik" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(desaktibatua)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "({0}) WMS geruza, automatikoki jaisten {1} zoom mailan" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "({0}) WMS geruza, {1} zoom mailan jaisten" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20532,17 +20530,17 @@ "jaitsi nahi dituzu?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "Bai, jaitsi irudiak" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "URL desegokia?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Jaitsi ikusgai dauden \"tile\"ak" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20551,33 +20549,33 @@ "bereizmena" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Bereizmena aldatu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "\"Tile\" okerrak berriz kargatu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Alpha kanala" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Gorde WMS geruza fitxategian" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Gorde WMS geruza" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Kargatu WMS geruza fitxategitik" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Kargatu WMS geruza" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -20585,17 +20583,17 @@ "Sustengurik gabeko WMS fitxategi-bertsioa; {0} aurkitu da eta {1} espero zen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Fitxategiaren formatuan errorea" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Fitxategia kargatzean errorea" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "WMS laster-marka ezarri" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Jaitsiera automatikoa" @@ -20613,21 +20611,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Ireki WMS geruza-zuri bat fitxategi batetik datuak kargatzeko" @@ -20651,7 +20654,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMSaren URL helbidea" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -34882,7 +34884,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Eman menu-izena eta WMSaren URL helbidea" - #~ msgid "The selected way does not contain the selected node." #~ msgid_plural "The selected way does not contain all the selected nodes." @@ -34904,4 +34903,7 @@ #~ msgid "Waterway Point" #~ msgstr "Ibaiko bidearen nodoa" + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Eman menu-izena eta WMSaren URL helbidea" #~ msgid "Yes, undelete them too" Index: /applications/editors/josm/i18n/po/fi.po =================================================================== --- /applications/editors/josm/i18n/po/fi.po (revision 23003) +++ /applications/editors/josm/i18n/po/fi.po (revision 23004) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 22:42+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 20:58+0000\n" "Last-Translator: Mika Laari \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-09-02 16:58+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -256,5 +256,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -426,5 +426,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -442,5 +442,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -616,10 +616,10 @@ "Polkuja ei voitu yhdistää. (Niitä ei voitu yhdistää yhdeksi pistejonoksi)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Yhdistä {0} polkua" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Valitse ainakin kaksi yhdistettävää polkua." @@ -670,5 +670,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -808,5 +808,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Monista" @@ -1541,8 +1541,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1601,6 +1601,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Virhe" @@ -1765,5 +1765,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Ei, peruuta" @@ -3081,5 +3081,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3205,5 +3205,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Kaksinkertainen ristiriita" @@ -3560,10 +3560,10 @@ msgstr "Varoitus: asetusten tallennus tiedostoon \"{0}\" epäonnistui" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Konfiguraatiotiedostossa virhe riv(e)illä {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3574,5 +3574,5 @@ "hakemisto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3583,5 +3583,5 @@ "hakemisto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3592,5 +3592,5 @@ "voitu luoda: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3601,5 +3601,5 @@ "voitu luoda: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3609,5 +3609,5 @@ "asetustiedosto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3618,5 +3618,5 @@ "asetustiedostolla." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3627,5 +3627,5 @@ "palauttaa oletusarvoihin: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3636,5 +3636,5 @@ "
ja luodaan uusi oletusarvoinen asetustiedosto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3645,10 +3645,10 @@ "palauttaa oletusarvoihin: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Virhe: Odottamaton rivi \"{0}\" kirjanmerkkitiedostossa \"{1}\"" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4932,5 +4932,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4948,5 +4948,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5481,5 +5481,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6178,5 +6178,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Tee kopio tästä relaatiosta, ja avaa se muokkaimeen" @@ -6259,5 +6259,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -8048,5 +8048,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8104,26 +8104,26 @@ msgstr "({0}/{1}): Ladataan relaatio ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Tagit ja jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Emorelaatiot" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Lapsirelaatiot" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Aseta rooli:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8135,14 +8135,14 @@ "
Mitä syklisille riippuvuuksille tehdään?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Poista ne, siivoa relaatio" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ei mitään, jätä relaatio silleen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8154,9 +8154,9 @@ "''{0}''

Lisätäänkö uusi jäsen silti relaatioon?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Useat jäsenet viittaavat samaan objektiin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8168,5 +8168,5 @@ "riippuvuuteen, jota on syytä välttää.
Ohitetaan relaatio ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8175,5 +8175,5 @@ "edelle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8182,5 +8182,5 @@ "perään" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8190,5 +8190,5 @@ "jäsenen edelle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8198,15 +8198,15 @@ "jäsenen perään" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Poista kaikki jäsenet, jotka viittaavat valittuihin objekteihin" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Relaatiomuokkain: Poista valitut" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -8215,5 +8215,5 @@ "objekteihin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8224,64 +8224,64 @@ "objektiin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Valitse objektit, joihin valitut relaatiojäsenet viittaavat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Lajittele relaation jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Järjestä" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Relaatiomuokkain: Lajittele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Käännä jäsenten järjestys ympäri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Käännä järjestys" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Relaatiomuokkain: Käännä järjestys" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Siirrä valittuja jäseniä ylöspäin" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Relaatiomuokkain: Siirrä ylöspäin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Siirrä valittuja jäseniä alaspäin" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Relaatiomuokkain: Siirrä alaspäin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Poista valitut jäsenet tästä relaatiosta" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Relaatiomuokkain: Poista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Poista relaatio, jota ollaan muokkaamassa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8293,23 +8293,23 @@ "muokattiin. Ne on poistettu relaation jäsenluettelosta." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Luo ristiriita ja sulje relaatiomuokkain" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "Palaa muokkaimeen jatkamaan relaation muokkaamista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8321,5 +8321,5 @@ "suljetaan muokkain?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8330,50 +8330,50 @@ "ensin aiempi ristiriita, ja yritä sitten uudelleen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Tee muutokset" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 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:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 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:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Lataa kaikki keskeneräiset jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Lataa jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Relaatiomuokkain: Lataa jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Lataa valitut keskeneräiset jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Aseta rooli valituille jäsenille" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Aseta rooli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8382,29 +8382,29 @@ msgstr[1] "Olet antamassa tyhjän roolin {0} objektille." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Se vastaa roolin poistamista näiltä objekteilta." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +msgid "Do you really want to apply the new role?" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Muokkaa relaatiota, johon valittu relaatiojäsen viittaa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8771,4 +8771,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12448,9 +12449,9 @@ msgstr "Valitse käytettävät liitännäiset" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -13683,11 +13684,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14167,13 +14168,17 @@ msgstr "Yhdistetään palvelimeen..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14925,11 +14930,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16427,5 +16432,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Tyhjä taso" @@ -18480,10 +18485,10 @@ msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20497,25 +20502,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "WMS-taso" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "OSM-palvelimen osoite:" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Tasot" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20523,45 +20525,41 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Virhe" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Ei löytynyt" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "Virheellinen käyttäjän ID" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." msgstr "" @@ -20678,24 +20676,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20706,17 +20704,17 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20725,50 +20723,50 @@ "resoluutiota" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Vaihda resoluutiota" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Tallenna WMS-taso tiedostoon" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Lataa WMS-taso tiedostosta" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Virhe ladattaessa tiedostoa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Automaattinen lataus" @@ -20786,21 +20784,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Luo tyhjä WMS-taso, johon voit avata kuvatiedoston." Index: /applications/editors/josm/i18n/po/fr.po =================================================================== --- /applications/editors/josm/i18n/po/fr.po (revision 23003) +++ /applications/editors/josm/i18n/po/fr.po (revision 23004) @@ -6,7 +6,7 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-30 12:26+0000\n" -"Last-Translator: isnogoud \n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-04 21:37+0000\n" +"Last-Translator: Emilien Klein \n" "Language-Team: Fr <>\n" "MIME-Version: 1.0\n" @@ -14,5 +14,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2010-09-02 17:00+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Language: French\n" @@ -69,7 +69,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -85,5 +85,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -255,5 +255,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -426,5 +426,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -442,5 +442,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -618,10 +618,10 @@ "une seule chaîne de nœuds)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Fusionner {0} chemins" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Veuillez sélectionner au moins deux chemins à fusionner." @@ -672,5 +672,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -811,5 +811,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Dupliquer" @@ -1554,8 +1554,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1614,6 +1614,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Erreur" @@ -1621,5 +1621,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:54 msgid "Reverse way" -msgstr "" +msgstr "Inverser le sens du chemin" #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:67 @@ -1780,5 +1780,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Non, annuler" @@ -3115,5 +3115,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3239,5 +3239,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Double conflit" @@ -3598,10 +3598,10 @@ msgstr "Attention : impossible de forcer les préférences pour ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Erreur dans le fichier de configuration aux lignes {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3612,5 +3612,5 @@ "préférences ''{0}'' n’est pas un dossier." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3621,5 +3621,5 @@ "préférences ''{0}'' n’est pas un dossier." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3630,5 +3630,5 @@ "le dossier manquant des préférences : {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3639,5 +3639,5 @@ "manquant des préférences : {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3647,5 +3647,5 @@ "fichier de préférences par défaut." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3656,5 +3656,5 @@ "par défaut." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3665,5 +3665,5 @@ "le fichier des préférences par défaut : {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3675,5 +3675,5 @@ "préférences par défaut." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3684,5 +3684,5 @@ "rétablir le fichier des préférences par défaut : {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" @@ -3690,5 +3690,5 @@ "Erreur : Ligne ''{0}'' inattendue dans le fichier des marque-pages ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4615,5 +4615,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257 msgid "Discard" -msgstr "" +msgstr "Abandonner" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260 @@ -4996,5 +4996,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -5012,5 +5012,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5556,5 +5556,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6263,5 +6263,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Copier et modifier la relation dans une nouvelle fenêtre" @@ -6344,5 +6344,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -8199,5 +8199,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8258,26 +8258,26 @@ msgstr "({0}/{1}) : téléchargement de la relation ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Attributs et membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Relations parentes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Relations enfants" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Appliquer le rôle :" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Entrer un rôle et l'appliquer aux membres sélectionnés de la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8289,14 +8289,14 @@ "
Comment voulez-vous procéder avec des dépendances circulaires ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Les enlever, nettoyer la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Les ignorer, laisser la relation telle quelle." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8309,9 +8309,9 @@ "à la relation ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Plusieurs membres se rapportent à la même primitive" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8324,15 +8324,15 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "Ajouter les primitives sélectionnées devant le premier membre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "Ajouter les primitives sélectionnées après le dernier membre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8341,5 +8341,5 @@ "Ajouter les primitives sélectionnées devant le premier membre sélectionné" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8348,5 +8348,5 @@ "Ajouter les primitives sélectionnées après le dernier membre sélectionné" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" @@ -8354,10 +8354,10 @@ #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Éditeur de relation : supprimer la sélection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -8366,5 +8366,5 @@ "dans la sélection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8375,64 +8375,64 @@ "dans la sélection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Sélectionner les primitives correspondant aux membres de la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Trier les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Trier" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Éditeur de relation : trier" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Inverser l’ordre des membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Inverser" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Éditeur de relation : inverser" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Déplacer les membres sélectionnés vers le haut" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Éditeur de relation : déplacer vers le haut" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Déplacer les membres sélectionnés vers le bas" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Éditeur de relation : déplacer vers le bas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Supprimer le membre sélectionné" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Éditeur de relation : retirer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Supprimer la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8444,23 +8444,23 @@ "était ouvert. Ils ont été retirés de la liste des membres de la relation." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 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:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Créer un conflit et fermer l’éditeur de relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Non, continuer les modifications." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "Reprendre la modification de la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8472,5 +8472,5 @@ "conflit et fermer l’éditeur ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8481,50 +8481,50 @@ "
Veuillez d’abord résoudre ce conflit puis réessayer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Mettre à jour la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Appliquer les modifications et fermer la fenêtre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Annuler les modifications et fermer la fenêtre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Ajouter un attribut vide" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Télécharger les membres incomplets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Éditeur de relation : télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Télécharger les membres incomplets sélectionnés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Définir le rôle pour le membre sélectionné" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Appliquer le rôle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8533,29 +8533,29 @@ msgstr[1] "Vous avez défini un rôle vide pour {0} primitives." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 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:1341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 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:1343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Oui, l’appliquer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Non, ne pas l’appliquer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Confirmer le rôle vide" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Modifier la relation à laquelle se rapporte le membre sélectionné" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8942,4 +8942,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12209,4 +12210,6 @@ msgid "Keep backup files when saving data layers" msgstr "" +"Garder des fichiers de sauvegarde lors de l'enregistrement des calques de " +"données" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74 @@ -12964,9 +12967,9 @@ msgstr "Configurer les greffons disponibles." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "Télécharger les greffons" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Vous devez redémarrer JOSM pour que les réglages prennent effet." @@ -13129,9 +13132,11 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 msgid "Internal style" -msgstr "" +msgstr "Style interne" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766 msgid "Internal style to be used as base for runtime switchable overlay styles" msgstr "" +"Style interne à utiliser comme base pour les styles changeables à chaud des " +"calques superposables" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787 @@ -14149,25 +14154,25 @@ #, java-format msgid "Coordinates imported: {0}" -msgstr "" +msgstr "Coordonnées importées : {0}" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 #, java-format msgid "Malformed sentences: {0}" -msgstr "" +msgstr "Phrases malformées : {0}" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 #, java-format msgid "Checksum errors: {0}" -msgstr "" +msgstr "Erreurs de sommes de calcul : {0}" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:50 #, java-format msgid "Unknown sentences: {0}" -msgstr "" +msgstr "Phrases inconnues : {0}" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:52 #, java-format msgid "Zero coordinates: {0}" -msgstr "" +msgstr "Coordonnées nulles : {0}" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:58 @@ -14294,11 +14299,11 @@ "il a l’identifiant {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Code={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14835,10 +14840,10 @@ msgstr "Connexion au serveur..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "Echec de l’ouverture de connexion à l’API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." @@ -14846,4 +14851,8 @@ "Impossible de joindre le serveur OSM. Veuillez vérifier votre connexion " "Internet." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "La lecture du texte d'erreur a échoué." #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -15719,5 +15728,5 @@ "important problème de configuration. JOSM va être arrêté." -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" @@ -15725,6 +15734,6 @@ "Attention : l’ouverture du fichier zip ''{0}'' a échoué. Exception : {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16003,9 +16012,11 @@ #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71 msgid "Edit opening hours" -msgstr "" +msgstr "Editer les heures d'ouverture" #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69 msgid "Edit time-tag of selected element in a graphical interface" msgstr "" +"Editer la balise de temps de l'élément sélectionné dans une interface " +"graphique" #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124 @@ -16243,9 +16254,9 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:93 msgid "AlignWayS: Alignment not possible" -msgstr "" +msgstr "AlignWayS: Alignement impossible" #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92 msgid "Aligning would result nodes outside the world.\n" -msgstr "" +msgstr "Cet alignement produirait des nœuds à l'extérieur du monde.\n" #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168 @@ -16446,4 +16457,8 @@ "
  • Align the segments. Press " msgstr "" +"\n" +"
    \n" +"
      \n" +"
    • Aligner les segments. Appuyez " #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103 @@ -16509,5 +16524,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:33 msgid "Buildings tags:" -msgstr "" +msgstr "Attributs de bâtiments :" #: ../plugins/buildings_tools/src/buildings_tools/Building.java:234 @@ -17405,5 +17420,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Calque vide" @@ -17563,5 +17578,5 @@ #, java-format msgid " adding {0} {1}" -msgstr "" +msgstr " ajout de {0} {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -17643,5 +17658,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55 msgid "CmdLine:" -msgstr "" +msgstr "Ligne de commande :" #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:26 @@ -19516,12 +19531,12 @@ msgstr "Bâtiments mitoyens" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" -msgstr "" - -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +msgstr "Éditer OpenSeaMap" + +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" -msgstr "" +msgstr "Éditeur Seamark" #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19 @@ -21460,9 +21475,9 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230 msgid "Subtitles" -msgstr "" +msgstr "Sous-titres" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230 msgid "Show subtitles in video" -msgstr "" +msgstr "Afficher les sous-titres avec la vidéo" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238 @@ -21516,5 +21531,5 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131 msgid "mute" -msgstr "" +msgstr "muet" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 @@ -21645,25 +21660,22 @@ msgstr "Sélectionner les séquences non-ramifiées de chemins" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Sauvegarder le calque WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "Calque WMS sans nom" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Nom de la carte" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Voie d’accès" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "Url du service" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Calques" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "Obtenir les calques" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -21671,49 +21683,43 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "Erreur WMS" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Erreur" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Limites" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Ne pas dessiner de ligne entre les points pour ce calque." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "URL du service WMS" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "URL invalide ?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 -#, fuzzy +msgstr "Url de service invalide." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." -msgstr "Sélectionner le premier calque WMS dans la liste" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +msgstr "Impossible d'obtenir la liste des calques WMS." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "Sélectionner le premier calque WMS dans la liste" +msgstr "Impossible d'analyser la liste des calques WMS." #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -21836,5 +21842,5 @@ "Cela peut amener à de mauvaises coordonnées." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -21843,19 +21849,19 @@ "« {0} »" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(désactivé)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Calque WMS ({0}), téléchargement automatique au zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Calque WMS ({0}), téléchargement au zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -21869,17 +21875,17 @@ "vos
      préférences.
      Voulez-vous récupérer des tuiles WMS ?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "Oui, récupérer les images" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "URL invalide ?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Télécharger les tuiles visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -21887,33 +21893,33 @@ "La zone demandée est trop grande. Prière de changer le zoom ou la résolution." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Changer la résolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Recharger les tuiles erronées" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Canal alpha" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Sauvegarder un calque WMS dans un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Sauvegarder le calque WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Charger un calque WMS depuis un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Charger le calque WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -21922,17 +21928,17 @@ "{1} attendue" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Erreur de format de fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Erreur lors du chargement du fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "Placer un marque-page WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Téléchargement automatique" @@ -21950,21 +21956,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Ouvrir un calque WMS vide pour charger des données depuis un fichier" @@ -21987,7 +21998,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "URL du service WMS" +msgstr "Ajouter une url de WMS" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -24575,5 +24585,5 @@ #: build/trans_presets.java:628 msgid "Amount of Steps" -msgstr "" +msgstr "Nombre de marches" #. group "Waypoints" @@ -26205,5 +26215,5 @@ #: build/trans_presets.java:1469 msgid "Brand" -msgstr "" +msgstr "Marque" #. item "Car/Fuel" combo "Brand" @@ -26263,5 +26273,5 @@ #: build/trans_presets.java:1359 build/trans_presets.java:1469 msgid "Independent" -msgstr "" +msgstr "Indépendant" #. item "Car/Fuel" text "Operator" @@ -26527,5 +26537,5 @@ #: build/trans_presets.java:1364 msgid "With shop" -msgstr "" +msgstr "Avec une boutique" #: build/trans_presets.java:1364 @@ -26729,14 +26739,14 @@ #: build/trans_presets.java:1422 msgid "Tyres" -msgstr "" +msgstr "Pneus" #. item "Car/Tyres" #: build/trans_presets.java:1423 msgid "Edit Tyres" -msgstr "" +msgstr "Editer Pneus" #: build/trans_presets.java:1429 build/trans_presets.java:1478 msgid "Contact:" -msgstr "" +msgstr "Contact :" #. item "Car/Tyres" label "Contact:" @@ -26903,5 +26913,5 @@ #: build/trans_presets.java:1472 msgid "Services:" -msgstr "" +msgstr "Services :" #. item "Motorcycle/Motorcycle Dealer" label "Services:" @@ -31742,5 +31752,5 @@ #: build/trans_presets.java:3519 msgid "Contact" -msgstr "" +msgstr "Contact" #. item "Annotation/Contact" @@ -31753,5 +31763,5 @@ #: build/trans_presets.java:3528 msgid "Wikipedia" -msgstr "" +msgstr "Wikipédia" #. item "Annotation/Contact" text "Wikipedia" @@ -36218,7 +36228,4 @@ msgid "PCN 2006 - Italy" msgstr "PCN 2006 - Italie" - -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Entrer un nom pour la carte et une URL pour le service WMS" #~ msgid "Move" @@ -38112,4 +38119,7 @@ #~ msgstr "Erreurs lors du téléchargement" +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Entrer un nom pour la carte et une URL pour le service WMS" + #~ msgid "" #~ "You cannot align connected segments.\n" Index: /applications/editors/josm/i18n/po/gl.po =================================================================== --- /applications/editors/josm/i18n/po/gl.po (revision 23003) +++ /applications/editors/josm/i18n/po/gl.po (revision 23004) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-07-28 13:21+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 21:42+0000\n" "Last-Translator: Dario \n" "Language-Team: Galician \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-09-02 16:57+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -255,5 +255,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -424,5 +424,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -440,5 +440,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -616,10 +616,10 @@ "serie de nodos)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Combinar {0} vías" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Por favor, selecciona polo menos dúas vías para combinar." @@ -670,5 +670,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -810,5 +810,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplicar" @@ -1544,8 +1544,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1604,6 +1604,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Erro" @@ -1770,5 +1770,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Non, abortar" @@ -3077,5 +3077,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3201,5 +3201,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Doble conflicto" @@ -3552,10 +3552,10 @@ msgstr "Atencion:fallou ao gardar preferencia para \"{0}\"" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Ficheiro de configuración mal formado nas liñas {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3566,5 +3566,5 @@ "non é un directorio." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3575,5 +3575,5 @@ "\"{0}\" non é un directorio." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3584,5 +3584,5 @@ "de preferencias desaparecido {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3593,5 +3593,5 @@ "directorio de preferencias desaparecido {0}." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3601,5 +3601,5 @@ "arquivo de preferencias por defecto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3610,5 +3610,5 @@ "preferencias por defecto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3619,5 +3619,5 @@ "de preferencias por defecto :{0}." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3629,5 +3629,5 @@ "defecto." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3638,10 +3638,10 @@ "de preferencias ao arquivo por defecto :{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Erro: Liña \"{0}\" inesperada no arquivo de marcador \"{1}\"" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4930,5 +4930,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4946,5 +4946,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5489,5 +5489,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6199,5 +6199,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Crear unha copia de esta relación e abrila en outra ventá de edición." @@ -6280,5 +6280,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -8106,5 +8106,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8161,26 +8161,26 @@ msgstr "({0}/{1}): Descargando relación \"{2}\"..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Etiquetas e membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Relacións pai" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Relacións fillo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Aplicar papel:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Introduce un papel e aplicao aos membros da relación escollidos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -8189,14 +8189,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Borraos, limpa a relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignoraos, deixa a relación como está" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8206,9 +8206,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Varios membros referidos á mesma primitiva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8218,15 +8218,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8234,5 +8234,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8240,20 +8240,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8262,64 +8262,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Ordenar os membros da relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Ordenar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Editor de relacións: Ordenar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Invertir a orde dos membros da relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Invertir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Editor de Relacións: Invertir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Mover os membros actualmente seleccionados cara arriba" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Editor de relacións: Mover Arriba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Mover os membros seleccionados actualmente cara abaixo" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Editor de relacións: Mover Abaixo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Borrar os membros escollidos para esta relación" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Editor de relación: Borrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Borrar a relación que se está a editar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8328,24 +8328,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Si, crear un conflicto e pechar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Prema para crear un conflicto e pechar este editor de relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Non, continuar editando" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" "Prema para volver ao editor de relación e continuar editando a relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8354,5 +8354,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8361,50 +8361,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Aplicar as actualizacións actuais" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Aplicar as actualizacións actuais e pecha o diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Pecha as actualizacións actuais e pecha o diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Engadir unha etiqueta baleira" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Descargar todos os membros incompletos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Descargar Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Editor de relación: Descargar Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Descargar membros escollidos incompletos" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +msgid "Sets a role for the selected members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 -msgid "Sets a role for the selected members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8413,29 +8413,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Editar a relación a cal a relación escollida fai referencia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8804,4 +8804,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12483,9 +12484,9 @@ msgstr "Configurar os engadidos dispoñibles." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Debes reiniciar JOSM para que algúns parámetros se fagan efectivos." @@ -13701,11 +13702,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14207,10 +14208,10 @@ msgstr "Contactando co Servidor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "Fallou ao abrir a conexión da API {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." @@ -14218,4 +14219,8 @@ "Non se puido conectar co servidor osm. Por favor revisa a túa conexión a " "internet." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14987,11 +14992,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16505,5 +16510,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "" @@ -18549,10 +18554,10 @@ msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20568,25 +20573,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Capa WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Nome do menú" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Servizo" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Capas" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20594,48 +20596,43 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Erro" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Non se atopa" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Non debuxar liñas entre puntos para esta capa." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "ID de usuario inválido" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "Non se puido renomear o arquivo!" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -20750,24 +20747,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20778,67 +20775,67 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Gardar capa WMS nun ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Cargar capa WMS dende ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Versión de ficheiro WMS non soportado; atopouse {0}, esperabase {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Erro de Formato de Ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Erro cargando ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "" @@ -20856,21 +20853,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Abrir unha capa WMS en branco para cargar datos dende un ficheiro" @@ -20893,7 +20895,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMS URL" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -35117,7 +35118,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Introduce un nome de menú e unha URL WMS" - #~ msgid "Be sure to include the following information:" #~ msgstr "Asegúrate de incluir a seguinte información:" @@ -35940,4 +35938,7 @@ #~ msgstr "Eliminar fisicamente do conxunto de cambios local" +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Introduce un nome de menú e unha URL WMS" + #~ msgid "" #~ "JOSM will have to remove your local primitive with id {0}
      from " Index: /applications/editors/josm/i18n/po/he.po =================================================================== --- /applications/editors/josm/i18n/po/he.po (revision 23003) +++ /applications/editors/josm/i18n/po/he.po (revision 23004) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 22:27+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 21:31+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Hebrew \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-09-02 17:01+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -252,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:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -420,5 +420,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -436,5 +436,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -608,10 +608,10 @@ msgstr "לא ניתן לשלב דרכים (לא ניתן למזג אותן למחרוזת אחת של צמתים)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "שלב {0} דרכים" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "נא בחר לפחות שתי דרכים לשילוב." @@ -661,5 +661,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -799,5 +799,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "שכפל" @@ -1498,8 +1498,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1558,6 +1558,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "שגיאה" @@ -1721,5 +1721,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "" @@ -2954,5 +2954,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3076,5 +3076,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3417,10 +3417,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "קובץ תצורה לא תקין בשורות {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3429,5 +3429,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3436,5 +3436,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3443,5 +3443,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3450,5 +3450,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3456,5 +3456,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3463,5 +3463,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3470,5 +3470,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3477,5 +3477,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3484,10 +3484,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4724,5 +4724,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4740,5 +4740,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5255,5 +5255,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5924,5 +5924,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -6005,5 +6005,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7789,5 +7789,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7844,26 +7844,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +msgid "Apply Role:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 -msgid "Apply Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -7872,14 +7872,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7889,9 +7889,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7901,15 +7901,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7917,5 +7917,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7923,20 +7923,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7945,64 +7945,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +msgid "Sort the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 -msgid "Sort the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 +msgid "Reverse the order of the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 -msgid "Reverse the order of the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "הזז את החברים הנבחרים מעלה" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "הזז מטה את החברים שנבחרו" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8011,23 +8011,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8036,5 +8036,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8043,50 +8043,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 +msgid "Download all incomplete members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 -msgid "Download all incomplete members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "הורד חברים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +msgid "Sets a role for the selected members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 -msgid "Sets a role for the selected members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8095,29 +8095,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8482,4 +8482,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12096,9 +12097,9 @@ msgstr "התאם תוספים זמינים." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "יהיה עליך להפעיל את JOSM מחדש כדי שכמה מההגדרות יכנסו לתוקף." @@ -13312,11 +13313,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -13788,13 +13789,17 @@ msgstr "מתחבר לשרת..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "לא יכול להתחבר לשרת osm. בדוק את חיבור האינטרנט." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14524,11 +14529,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16026,5 +16031,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "שכבה ריקה" @@ -18067,10 +18072,10 @@ msgstr "מדרג" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20066,25 +20071,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "שכבת WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "שם תפריט" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "שירות" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "שכבות" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20092,43 +20094,41 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "שגיאה" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -msgid "Show Bounds" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "אל תצייר קווים בין נקודות בשכבה זו." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "כתובת WMS" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." msgstr "" @@ -20245,24 +20245,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20273,67 +20273,67 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "הורד משטחים גלויים" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "שנה רזולוציה" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "טען מחדש משטחים פגומים" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "שמור שכבת WMS לקובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "טען שכבת WMS מקובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "שגיאה בפורמט קובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "שגיאה בטעינת קובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "הורדה אוטומטית" @@ -20351,21 +20351,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "פתח שכבת WMS ריקה לטעינת נתונים מקובץ" @@ -20388,7 +20393,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "כתובת WMS" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -34562,7 +34566,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "הזן שם תפריט וכתובת WMS" - #~ msgid "Move" #~ msgstr "הזז" @@ -34889,4 +34890,7 @@ #~ msgid "Sorry, doesn't work with anonymous users" #~ msgstr "מצטער, לא עובד עם משתמשים אנונימיים" + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "הזן שם תפריט וכתובת WMS" #~ msgid "

      Thank you for your understanding

      " Index: /applications/editors/josm/i18n/po/is.po =================================================================== --- /applications/editors/josm/i18n/po/is.po (revision 23003) +++ /applications/editors/josm/i18n/po/is.po (revision 23004) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 22:33+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 21:17+0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" "Language-Team: Icelandic \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-09-02 16:58+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -248,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:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -417,5 +417,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -433,5 +433,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -609,10 +609,10 @@ "að sameina þá þurfa þeir að vera ein samfelld röð af hnútum" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Sameina {0} vegi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina." @@ -661,5 +661,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -799,5 +799,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Tvöfalda" @@ -1498,8 +1498,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1558,6 +1558,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Villa" @@ -1720,5 +1720,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "" @@ -2960,5 +2960,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3082,5 +3082,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3424,10 +3424,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3436,5 +3436,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3443,5 +3443,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3450,5 +3450,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3457,5 +3457,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3463,5 +3463,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3470,5 +3470,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3477,5 +3477,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3484,5 +3484,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3491,10 +3491,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4725,5 +4725,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4741,5 +4741,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5248,5 +5248,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5917,5 +5917,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Afrita þessi vensl og opna breytingarglugga fyrir afritið" @@ -5998,5 +5998,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7784,5 +7784,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7841,26 +7841,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Stök og tögg þeirra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Yfirvensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Undirvensl" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +msgid "Apply Role:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 -msgid "Apply Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -7869,14 +7869,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7889,9 +7889,9 @@ "þennan hlut?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Mörg stök benda á sama hlutinn" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7901,15 +7901,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7917,5 +7917,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7923,20 +7923,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7945,64 +7945,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Bæta völdum stökum á vallistann" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Raða stöknum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Raða" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 +msgid "Reverse the order of the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 -msgid "Reverse the order of the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Færa valda meðlimi upp" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Færa valda meðlimi niður" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Fjarlægja völd stök úr þessum venslum" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8011,23 +8011,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8036,5 +8036,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8043,50 +8043,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Bæta við tómu taggi" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 +msgid "Download all incomplete members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 -msgid "Download all incomplete members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Niðurhala meðlimum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 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:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Vista hlutverk" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8095,29 +8095,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Breyta venslunum sem valið stak bendir á" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8483,4 +8483,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12093,9 +12094,9 @@ msgstr "Stillingar fyrir viðbætur." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -13308,11 +13309,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -13784,14 +13785,18 @@ msgstr "Hef samband við þjóninn..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "" "Gat ekki tengst OSM þjóninum. Vinsamlegast athugaðu nettenginguna þína." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14521,11 +14526,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16023,5 +16028,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Tómt lag" @@ -18058,10 +18063,10 @@ msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20053,25 +20058,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "WMS lag" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Þjónustuvegur" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Lög" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20079,44 +20081,41 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Villa" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Skoða notandasíðu" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Engin gögn fundust á þessu svæði." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." msgstr "" @@ -20233,24 +20232,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20261,67 +20260,67 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Niðurhala sýnilega reiti" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Breyta upplausn" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Hlaða reiti sem innihalda villur" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Vista WMS lag í skrá" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Hlaða WMS lag úr skrá" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Sjálfvirkt niðurhal" @@ -20339,21 +20338,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "" Index: /applications/editors/josm/i18n/po/it.po =================================================================== --- /applications/editors/josm/i18n/po/it.po (revision 23003) +++ /applications/editors/josm/i18n/po/it.po (revision 23004) @@ -5,7 +5,7 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-30 13:02+0000\n" -"Last-Translator: Davide Prade \n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-05 15:15+0000\n" +"Last-Translator: Milo Casagrande \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-09-02 17:00+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -67,7 +67,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -83,5 +83,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -254,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:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -423,5 +423,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -439,5 +439,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -616,10 +616,10 @@ "di nodi)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Unisci {0} percorsi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Selezionare almeno due percorsi da unire." @@ -670,5 +670,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -813,5 +813,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplica" @@ -1557,8 +1557,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1617,6 +1617,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Errore" @@ -1624,5 +1624,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:54 msgid "Reverse way" -msgstr "" +msgstr "Inverti percorso" #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:67 @@ -1783,5 +1783,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "No, annulla" @@ -3133,5 +3133,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3257,5 +3257,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Doppio conflitto" @@ -3616,10 +3616,10 @@ msgstr "Attenzione: è fallita la persistenza delle preferenze su ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Errore di formato nel file di configurazione alla linea {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3630,5 +3630,5 @@ "delle preferenze ''{0}'' non è in realtà una cartella." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3639,5 +3639,5 @@ "preferenze ''{0}'' non è in realtà una cartella." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3648,5 +3648,5 @@ "possibile creare la cartella delle preferenze mancante: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3657,5 +3657,5 @@ "creare la cartella delle preferenze mancante: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3665,5 +3665,5 @@ "file di preferenze predefinito." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3674,5 +3674,5 @@ "file predefinito." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3683,5 +3683,5 @@ "reimpostare il file delle preferenze con uno predefinito: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3693,5 +3693,5 @@ "predefinito." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3702,5 +3702,5 @@ "possibile reimpostare il file delle preferenze con uno predefinito: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" @@ -3708,5 +3708,5 @@ "Errore: linea ''''{0}'''' non prevista nel file di segnalibro ''''{1}''''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4383,5 +4383,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:325 msgid "Authentication failed" -msgstr "Autenticazione fallita" +msgstr "Autenticazione non riuscita" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 @@ -5017,5 +5017,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -5033,5 +5033,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5587,5 +5587,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6307,5 +6307,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -6390,5 +6390,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -8260,5 +8260,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8319,26 +8319,26 @@ msgstr "({0}/{1}): Scaricamento relazione ''''{2}''''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Etichette e Membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Relazioni da cui dipende" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Relazioni figlie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Applica ruolo:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Inserire un ruolo e applicarlo ai membri della relazione selezionata" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -8351,14 +8351,14 @@ "circolari?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Rimuovili, ripulisci la relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignorali, mantieni la relazione com'è" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8371,9 +8371,9 @@ "aggiungere un altro membro alla relazione?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Più membri fanno riferimento alla stessa primitiva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8386,5 +8386,5 @@ "''''{0}'''' omessa." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8393,5 +8393,5 @@ "del primo membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8400,5 +8400,5 @@ "l''ultimo membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8408,5 +8408,5 @@ "del primo membro selezionato" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8416,5 +8416,5 @@ "l''ultimo membro selezionato" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" @@ -8422,10 +8422,10 @@ #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Editor delle relazioni: Rimuovi selezione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -8434,5 +8434,5 @@ "selezione corrente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8443,64 +8443,64 @@ "selezione corrente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Seleziona le primitive per i membri della relazione selezionata" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Ordina i membri della relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Ordina" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Editor delle relazioni: Ordina" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Inverti l''ordine dei membri della relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Inverti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Editor delle relazioni: Inverti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Sposta in alto i membri attualmente selezionati" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Editor delle relazioni: Sposta in alto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Sposta in basso i membri attualmente selezionati" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Editor delle relazioni: Sposta in basso" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Rimuovi i membri correntemente selezionati da questa relazione" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Editor delle relazioni: Rimuovi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Elimina la relazione correntemente modificata" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8512,24 +8512,24 @@ "era aperto. Sono stati rimossi dalla lista dei membri." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Si, crea un conflitto e chiudi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 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:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "No, continua la modifica" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 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:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8541,5 +8541,5 @@ "desidera creare un conflitto e chiudere l''editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8551,50 +8551,50 @@ "riprovare." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Applica gli aggiornamenti correnti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 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:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 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:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Aggiungi una etichetta vuota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Scarica tutti i membri incompleti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Scarica i membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Editor delle relazioni: Scarica membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Scarica i membri incompleti selezionati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 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:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Applica Ruolo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8603,25 +8603,25 @@ msgstr[1] "Si sta impostando un ruolo vuoto su {0} primitive." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 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:1341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 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:1343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Si, applica" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "No, non applicare" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Conferma ruolo vuoto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8629,5 +8629,5 @@ "correntemente selezionato." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -9024,4 +9024,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -13080,9 +13081,9 @@ msgstr "Configura le estensioni disponibili." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "Scarica estensioni" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -14291,25 +14292,25 @@ #, java-format msgid "Coordinates imported: {0}" -msgstr "" +msgstr "Coordinate importate: {0}" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 #, java-format msgid "Malformed sentences: {0}" -msgstr "" +msgstr "Sentenza malformata: {0}" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48 #, java-format msgid "Checksum errors: {0}" -msgstr "" +msgstr "Errori di checksum: {0}" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:50 #, java-format msgid "Unknown sentences: {0}" -msgstr "" +msgstr "Sentenze non conosciute: {0}" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:52 #, java-format msgid "Zero coordinates: {0}" -msgstr "" +msgstr "Coordinate a zero: {0}" #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:58 @@ -14434,11 +14435,11 @@ "chiuso con id {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Code={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14969,10 +14970,10 @@ msgstr "Connessione al server in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "E'' fallita l''apertura della connessione alle API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." @@ -14980,4 +14981,8 @@ "Impossibile connettersi al server osm. Controllare la propria connessione ad " "internet." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -15864,5 +15869,5 @@ "serio problema di configurazione. JOSM terminerà di funzionare." -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" @@ -15871,6 +15876,6 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16149,9 +16154,11 @@ #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71 msgid "Edit opening hours" -msgstr "" +msgstr "Modifica orari di apertura" #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69 msgid "Edit time-tag of selected element in a graphical interface" msgstr "" +"Modifica l''etichetta dell''orario dell''elemento selezionato tramite " +"interfaccia grafica" #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124 @@ -16660,5 +16667,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:33 msgid "Buildings tags:" -msgstr "" +msgstr "Etichette degli edifici:" #: ../plugins/buildings_tools/src/buildings_tools/Building.java:234 @@ -17554,5 +17561,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Livello vuoto" @@ -19664,10 +19671,10 @@ msgstr "Complesso" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "Modifica OpenSeaMap" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "Editor delle caratteristiche nautiche" @@ -21833,75 +21840,69 @@ msgstr "Seleziona le sequenze di percorsi non ramificate" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Salva livello WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "Livello WMS senza nome" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Nome del menu" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Strada di servizio" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "Indirizzo URL del servizio" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Livelli" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "Ottieni i livelli" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" "so you can not use it. This message will not show again." msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +"Il livello non supporta alcuna proiezione di JOSM,\n" +"e quindi non è possibile utilizzarlo. Questo messaggio non sarà più " +"visualizzato." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "Errore WMS" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "Visualizza confini" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Errore" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Confini" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Non disegnare le linee tra i punti di questo livello." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "Non è stato trovato alcun riquadro di confine per questo livello." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "URL WMS" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "Indirizzo URL non valido?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 -#, fuzzy +msgstr "Indirizzo URL del servizio non valido." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." -msgstr "Seleziona il primo livello WMS della lista." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +msgstr "Impossibile ottenere la lista dei livelli WMS." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "Seleziona il primo livello WMS della lista." +msgstr "Impossibile analizzare la lista dei livelli WMS." #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -22024,5 +22025,5 @@ "Potrebbero essere presenti errori nelle coordinate." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -22031,9 +22032,9 @@ "non corretto ''{0}''" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(disattivato)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" @@ -22041,10 +22042,10 @@ "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -22060,17 +22061,17 @@ "WMS?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "Si, preleva le immagini" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "Indirizzo URL non valido?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Scarica i tasselli visibili" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -22079,50 +22080,50 @@ "visuale, oppure di cambiare la risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Ricarica i tasselli non corretti" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Salva il livello WMS su file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Salva livello WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Carica il livello WMS da file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Carica livello WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Versione del file WMS non supportata; trovata {0}, attesa {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Errore nel formato del file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Errore durante il caricamento del file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "Imposta segnalibro WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Scaricamento automatico" @@ -22140,26 +22141,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" -"{0} funzionerà ma il controllo remoto è disabilitato.\n" -"La versione corrente di \"{1}\": {2}, versione interna {3}. Versione " -"richiesta {4}, versione interna {5}.\n" -"Si dovrebbero aggiornate le estensioni. Se questo non è risolutivo, " -"riportare l''errore per \"{0}\"." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "{0}: Problema con il controllo remoto" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Apri un livello WMS vuoto per caricare i dati da file" @@ -22183,7 +22184,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "URL WMS" +msgstr "Aggiungi indirizzo URL WMS" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -26400,5 +26400,5 @@ msgctxt "aerialway" msgid "Goods" -msgstr "" +msgstr "Teleferica" #. item "Aerialway/Goods" @@ -26406,5 +26406,5 @@ msgctxt "aerialway" msgid "Edit Goods" -msgstr "" +msgstr "Modifica teleferica" #. group "Car" @@ -36448,7 +36448,4 @@ msgstr "PCN 2006 - Italia" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Inserire un nome per il menù e un URL WMS" - #~ msgid "No data imported." #~ msgstr "Nessun dato importato." @@ -36698,4 +36695,7 @@ #~ msgid "osmarender options" #~ msgstr "Opzioni osmarender" + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Inserire un nome per il menù e un URL WMS" #~ msgid "Merge nodes with different memberships?" @@ -38731,2 +38731,15 @@ #~ msgid "Waterway Point" #~ msgstr "Nautica" + +#~ msgid "" +#~ "{0} will work but remote control is disabled.\n" +#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " +#~ "internal version {5}.\n" +#~ "You should update the plugins. If this does not help report a bug for " +#~ "\"{0}\"." +#~ msgstr "" +#~ "{0} funzionerà ma il controllo remoto è disabilitato.\n" +#~ "La versione corrente di \"{1}\": {2}, versione interna {3}. Versione " +#~ "richiesta {4}, versione interna {5}.\n" +#~ "Si dovrebbero aggiornate le estensioni. Se questo non è risolutivo, " +#~ "riportare l''errore per \"{0}\"." Index: /applications/editors/josm/i18n/po/ja.po =================================================================== --- /applications/editors/josm/i18n/po/ja.po (revision 23003) +++ /applications/editors/josm/i18n/po/ja.po (revision 23004) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-31 21:49+0000\n" -"Last-Translator: ribbon \n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 21:58+0000\n" +"Last-Translator: Dirk Stöcker \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-09-02 17:02+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: JAPAN\n" @@ -73,7 +73,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -89,5 +89,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -258,5 +258,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -430,5 +430,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -446,5 +446,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -619,10 +619,10 @@ "ウェイを結合できません（これらをノードの一列として統合することができません）" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "{0}ウェイを結合" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "結合するウェイを少なくとも二つ選択してください。" @@ -673,5 +673,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -812,5 +812,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "複製" @@ -1532,8 +1532,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1592,6 +1592,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "エラー" @@ -1756,5 +1756,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "いいえ、異常終了します" @@ -3043,5 +3043,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3166,5 +3166,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "二重の競合" @@ -3509,10 +3509,10 @@ msgstr "警告: プリセットの設定を ''{0}''とするのに失敗しました。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "不正な設定がファイルの{0}行目にあります。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3523,5 +3523,5 @@ "ありません。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3532,5 +3532,5 @@ "ではありません。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3540,5 +3540,5 @@ "警告: 設定の初期化に失敗しました。設定ディレクトリ {0} の作成に失敗しました。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3549,5 +3549,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3557,5 +3557,5 @@ "成します。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3565,5 +3565,5 @@ "警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3574,5 +3574,5 @@ "トできません" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3583,5 +3583,5 @@ "
      に取って、新しい初期設定ファイルを作ります。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3592,10 +3592,10 @@ "に失敗" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "エラー: ブックマークファイル''{1}'' に予期せぬ行 ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4862,5 +4862,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4878,5 +4878,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5399,5 +5399,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6078,5 +6078,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く" @@ -6159,5 +6159,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7972,5 +7972,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8026,26 +8026,26 @@ msgstr "リレーション \"{2}\" をダウンロード中 ({0}/{1})" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "タグとメンバ－" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "親リレーション" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "子リレーション" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "ロールを適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "ロールを入力して選択されたリレーションメンバーに適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -8057,14 +8057,14 @@ "参照をどうしますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "削除し、リレーションをクリーンナップ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "無視し、リレーションはそのまま" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8077,9 +8077,9 @@ "か？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "複数のメンバーが同じプリミティブを参照しています" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8091,5 +8091,5 @@ "起こすので薦められません。
      リレーション ''{0}'' をスキップします。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8097,5 +8097,5 @@ "現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8103,5 +8103,5 @@ "現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8111,5 +8111,5 @@ "に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8119,20 +8119,20 @@ "に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "選択されたプリミティブのひとつを参照している全てのメンバーを削除" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "リレーション編集画面: 削除が選択されました" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "現在の選択の中でプリミティブを参照しているリレーションメンバーを選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8142,64 +8142,64 @@ "現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "選択されたリレーションメンバーのプリミティブを選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "リレーションメンバーをソート" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "並べ替え" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "リレーション編集画面: ソート" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "リレーションメンバーの表示順序を反転する" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "逆順" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "リレーションエディタ:反転" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "選択したメンバーを1つ上に移動します" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "リレーション編集画面: 上へ移動" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "選択したメンバーを一つ下に移動します" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "リレーション編集画面: 下へ移動" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "このリレーションから選択したメンバーを削除" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "リレーション編集画面: 削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "現在編集されたリレーションを削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8211,23 +8211,23 @@ "それらはリレーションメンバーリストから削除されました。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "はい、競合を作成して閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "クリックして競合を作成し、このリレーションエディタを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "いいえ、編集を続ける" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "クリックしてリレーションエディタに戻り、リレーション編集を再開" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8238,5 +8238,5 @@ "集を続けることはできません

      競合を作成してエディタを閉じますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8247,50 +8247,50 @@ "最初にこの競合を解決してからやり直してください。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "現在の更新を適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "更新を適用してダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "更新をキャンセルしてダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "空のタグを追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "全ての不完全なメンバーをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "メンバーのダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "リレーション編集画面: メンバーをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "選択された不完全なメンバーをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "選択されたメンバーにロールをセット" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "ロールを適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8298,29 +8298,29 @@ msgstr[0] "{0} プリミティブに空のロールを設定しています。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "これはこれらのプリミティブのロールを削除することと同じです" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "新しいロールを本当に適用しますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "はい、適用します" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "いいえ、適用しません" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "空のロールを確認" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "選択中のリレーションメンバーが参照しているリレーションを編集" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8695,4 +8695,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12498,9 +12499,9 @@ msgstr "利用可能なプラグインを設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "プラグインをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "設定を有効にするにはJOSMを再起動する必要があります。" @@ -13779,11 +13780,11 @@ "た。" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(コード={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14275,13 +14276,17 @@ msgstr "サーバに接続中..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "API {0} への接続に失敗しました" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "osmサーバに接続できません。インターネット接続 をチェックしてください。" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -15098,11 +15103,11 @@ "動作停止します。" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "警告: zipファイル ''{0}'' のハンドルに失敗。例外コード: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16666,5 +16671,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "空のレイヤー" @@ -18738,10 +18743,10 @@ msgstr "テラスハウス" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "Seamarkエディタ" @@ -20776,25 +20781,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "WMS レイヤーを保存" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "メニューの名前" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "敷地内道路" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "レイヤー" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20802,49 +20804,43 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "エラー" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "境界" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "このレイヤーの点の間に線を引かない。" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "不正なURL？" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." -msgstr "リスト中の最初のWMSレイヤを選択。" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "リスト中の最初のWMSレイヤを選択。" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -20965,24 +20961,24 @@ "間違った座標にたどりつく可能性があります。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "警告: WMS レイヤーは不正なベースURL ''{0}'' のために無効化されました" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(無効化)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS レイヤー ({0}), 自動的に倍率 {1} でダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS レイヤー ({0}), 自倍率 {1} でダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20996,17 +20992,17 @@ "設定を
      チェックしてください。
      強制的にWMS タイルを取得しますか？" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "はい、画像を取得します" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "不正なURL？" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "見えるタイルのダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -21014,50 +21010,50 @@ "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "解像度の変更" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "誤ったタイルのリロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "アルファチャンネル" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "WMSレイヤーをファイルに保存" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "WMS レイヤーを保存" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "WMSレイヤーをファイルから読み込む" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "WMS レイヤーをロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "ファイルフォーマットエラー" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "ファイルの読み込みエラー" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "WMSブックマークをセット" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "自動ダウンロード" @@ -21075,21 +21071,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "ファイルからデータをロードするためのブランクWMSレイヤーを開く" @@ -21112,7 +21113,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMS URL" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -35333,7 +35333,4 @@ msgstr "PCN 2006 - イタリア" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "メニュー名とWMS URLを入力" - #~ msgid "Move" #~ msgstr "移動" @@ -36002,4 +35999,7 @@ #~ msgid "The base URL for the OSM server (REST API)" #~ msgstr "OSMサーバのベースURL（REST API)" + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "メニュー名とWMS URLを入力" #~ msgid "Metacarta Map Rectifier image id" Index: /applications/editors/josm/i18n/po/nb.po =================================================================== --- /applications/editors/josm/i18n/po/nb.po (revision 23003) +++ /applications/editors/josm/i18n/po/nb.po (revision 23004) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 22:19+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 22:14+0000\n" "Last-Translator: Anders Einar Hilden \n" "Language-Team: Norwegian Bokmal \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-09-02 16:57+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -250,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:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -420,5 +420,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -436,5 +436,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -610,10 +610,10 @@ msgstr "Kan ikke sammenføye linjer. (Kan ikke bli sammenhengende nodestreng)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Sammenføy {0} linjer" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Velg minst to linjer å sammenføye." @@ -664,5 +664,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -802,5 +802,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Fordoble" @@ -1501,8 +1501,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1561,6 +1561,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Feil" @@ -1724,5 +1724,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Nei, avbryt" @@ -2977,5 +2977,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3099,5 +3099,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3447,10 +3447,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Innstillingsfil har feil i linje {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3459,5 +3459,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3466,5 +3466,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3473,5 +3473,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3480,5 +3480,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3486,5 +3486,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3493,5 +3493,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3500,5 +3500,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3507,5 +3507,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3514,10 +3514,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4755,5 +4755,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4771,5 +4771,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5306,5 +5306,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5975,5 +5975,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -6056,5 +6056,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7840,5 +7840,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7895,26 +7895,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +msgid "Apply Role:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 -msgid "Apply Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -7923,14 +7923,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7940,9 +7940,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7952,15 +7952,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7968,5 +7968,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7974,20 +7974,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7996,64 +7996,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +msgid "Sort the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 -msgid "Sort the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 msgid "Sort" msgstr "Sorter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 +msgid "Reverse the order of the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 -msgid "Reverse the order of the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Flytt valgte medlem opp" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Flytt valgt medlem ned" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8062,23 +8062,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8087,5 +8087,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8094,50 +8094,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 +msgid "Download all incomplete members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 -msgid "Download all incomplete members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Last ned medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +msgid "Sets a role for the selected members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 -msgid "Sets a role for the selected members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8146,29 +8146,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8535,4 +8535,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12200,9 +12201,9 @@ msgstr "Indstil tilgængelige programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Du må starte JOSM for at enkelte innstillingene skal tre i kraft." @@ -13420,11 +13421,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Kode={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -13905,14 +13906,18 @@ msgstr "Kobler til tjener …" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "Klarte ikke åpne tilkobling til API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "" "Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14647,11 +14652,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16172,5 +16177,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Blankt lag" @@ -18240,10 +18245,10 @@ msgstr "Terasse" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20247,25 +20252,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Lagre WMS-lag" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Meny Navn" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Adkomstvei" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Lag" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20273,43 +20275,41 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Feil" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -msgid "Show Bounds" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Tegn ikke linjer mellem punkt i dette laget." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." msgstr "" @@ -20428,24 +20428,24 @@ "Dette resulterer i feil koordinater." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS lag ({0}) laster automatisk ned i zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS lag ({0}) laster ned i zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20456,67 +20456,67 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Last ned synlige kartbilder" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "Du har bestilt for stort område. Zoom inn eller bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Last ned kartbilder med feil på nytt" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Lagre WMS lag til fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Lagre WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "les inn WMS lag fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Last inn WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Feil Fil Format" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Feil ved lasting av fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Automatisk nedlasting" @@ -20534,21 +20534,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Åpne tomt WMS lag til data fra fil" @@ -20571,7 +20576,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMS URL" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -34776,7 +34780,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Gi meny navn og WMS URL" - #~ msgid "Move" #~ msgstr "Flytt" @@ -35387,4 +35388,7 @@ #~ msgstr "" #~ "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS" + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Gi meny navn og WMS URL" #~ msgid "Please select the row to copy." Index: /applications/editors/josm/i18n/po/nl.po =================================================================== --- /applications/editors/josm/i18n/po/nl.po (revision 23003) +++ /applications/editors/josm/i18n/po/nl.po (revision 23004) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 22:15+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 21:39+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-09-02 16:57+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -257,5 +257,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -428,5 +428,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -444,5 +444,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -621,10 +621,10 @@ "reeks van knopen)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "{0} wegen combineren" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Selecteer twee of meer wegen om te combineren." @@ -675,5 +675,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -816,5 +816,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Dupliceren" @@ -1545,8 +1545,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1605,6 +1605,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Fout" @@ -1770,5 +1770,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Neeêh, Niet doen!" @@ -3078,5 +3078,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3202,5 +3202,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Dubbel conflict" @@ -3551,10 +3551,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Configuratiebestand is verminkt in regels {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3563,5 +3563,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3570,5 +3570,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3577,5 +3577,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3584,5 +3584,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3592,5 +3592,5 @@ "bestand wordt aangemaakt." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3601,5 +3601,5 @@ "standaard voorkeuren bestand." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3608,5 +3608,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3615,5 +3615,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3622,10 +3622,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4869,5 +4869,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4885,5 +4885,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5392,5 +5392,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6065,5 +6065,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -6146,5 +6146,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7932,5 +7932,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7987,26 +7987,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +msgid "Apply Role:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 -msgid "Apply Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -8015,14 +8015,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8032,9 +8032,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8044,15 +8044,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8060,5 +8060,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8066,20 +8066,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8088,64 +8088,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +msgid "Sort the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 -msgid "Sort the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 +msgid "Reverse the order of the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 -msgid "Reverse the order of the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "De geselecteerde leden omhoog verplaatsen" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "De geselecteerde leden omlaag verplaatsen" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8154,23 +8154,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8179,5 +8179,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8186,50 +8186,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 +msgid "Download all incomplete members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 -msgid "Download all incomplete members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Leden downloaden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +msgid "Sets a role for the selected members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 -msgid "Sets a role for the selected members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8238,29 +8238,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8628,4 +8628,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12314,9 +12315,9 @@ msgstr "Beschikbare plugins configureren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "U dient JOSM opnieuw te starten om sommige instellingen te activeren." @@ -13532,11 +13533,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14008,14 +14009,18 @@ msgstr "Met server verbinden..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "" "Kan niet met de OSM-server verbinden. Controleer je internetverbinding." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14751,11 +14756,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16270,5 +16275,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Lege laag" @@ -18333,10 +18338,10 @@ msgstr "Terras" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20350,25 +20355,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "WMS-laag" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Menunaam" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Toegangsweg" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Lagen" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20376,43 +20378,41 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Fout" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -msgid "Show Bounds" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Geen lijnen tussen punten in deze laag tekenen." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMS-URL" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." msgstr "" @@ -20532,24 +20532,24 @@ "Dat kan tot foutieve coördinaten leiden." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-laag ({0}), automatisch in zoom {1} downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-laag ({0}), in zoom {1} downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20560,17 +20560,17 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Zichtbare tegels downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20578,50 +20578,50 @@ "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Resolutie veranderen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Foutieve tegels herladen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "WMS-laag in bestand opslaan" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "WMS-laag uit bestand laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Fout in bestandsindeling" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Laden bestand is mislukt" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Automatisch downloaden" @@ -20639,21 +20639,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Een lege WMS-laag openen om gegevens uit een bestand in te laden" @@ -20677,7 +20682,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMS-URL" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -34853,7 +34857,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Een menunaam en WMS-URL invoeren" - #~ msgid "Select a bookmark first." #~ msgstr "Selecteer eerst een bladwijzer." @@ -35239,4 +35240,7 @@ #~ msgid "error requesting update" #~ msgstr "update aanvragen is mislukt" + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Een menunaam en WMS-URL invoeren" #~ msgid "{0} within the track." Index: /applications/editors/josm/i18n/po/pl.po =================================================================== --- /applications/editors/josm/i18n/po/pl.po (revision 23003) +++ /applications/editors/josm/i18n/po/pl.po (revision 23004) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 22:54+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 21:12+0000\n" "Last-Translator: Paweł Marynowski \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-09-02 16:58+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -74,7 +74,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -90,5 +90,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -259,5 +259,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -429,5 +429,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -445,5 +445,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -621,10 +621,10 @@ "węzłów)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Połącz {0} dróg" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Wybierz co najmniej dwie drogi do połączenia." @@ -675,5 +675,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -815,5 +815,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Powiel" @@ -1532,8 +1532,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1592,6 +1592,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Błąd" @@ -1756,5 +1756,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Nie, przerwij" @@ -3030,5 +3030,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3153,5 +3153,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3503,10 +3503,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Błąd w pliku konfiguracyjnym w linii {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3517,5 +3517,5 @@ "jest folderem." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3526,5 +3526,5 @@ "folderem." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3535,5 +3535,5 @@ "brakującego katalogu ustawień: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3544,5 +3544,5 @@ "katalogu ustawień: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3551,5 +3551,5 @@ "Ostrzeżenie: Brak pliku ustawień''{0}''. Tworzenie pliku ustawień domyślnych." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3560,5 +3560,5 @@ "domyślnych." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3569,5 +3569,5 @@ "ustawień domyślnych: {0} " -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3578,5 +3578,5 @@ "
      {0}
      i tworzenia nowego pliku ustawień domyślnych." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3587,10 +3587,10 @@ "Nie udało się przywrócić pliku ustawień domyślnych: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4846,5 +4846,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4862,5 +4862,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5378,5 +5378,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6058,5 +6058,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Tworzy kopię tej relacji i otwiera ją w nowym oknie edytora relacji" @@ -6139,5 +6139,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7931,5 +7931,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7986,26 +7986,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Tagi i Członkowie" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +msgid "Apply Role:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 -msgid "Apply Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -8014,14 +8014,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8031,9 +8031,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8043,15 +8043,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "Dodaje wszystkie obecnie zaznaczone elementy przed pierwszym członkiem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "Dodaje wszystkie obecnie zaznaczone elementy po ostatnim członku" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8061,5 +8061,5 @@ "członkiem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8069,20 +8069,20 @@ "członkiem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8091,64 +8091,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Zaznacza elementy dla wybranych członków relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Sortuj członków relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Odwróć kolejność członków relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Przesuń aktualnie zaznaczonych członkół w górę" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii." #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Usuwa zaznaczonych członków tej relacji" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Usuwa obecnie edytowaną relację" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8157,23 +8157,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8182,5 +8182,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8189,50 +8189,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Zastosuj zmiany" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Zastosuj zmiany i zamknij okno" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Anuluj aktualizowanie i zamknij okno" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Pobierz wszystkich brakujących członków relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Pobierz członków" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Pobiera zaznaczonych niekompletnych członków" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Ustaw rolę dla zaznzczonych członków" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Zastosuj rolę" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8241,29 +8241,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8632,4 +8632,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12292,9 +12293,9 @@ msgstr "Konfiguracja dostępnych wtyczek." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -13524,11 +13525,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Kod={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14003,14 +14004,18 @@ msgstr "Łączenie z serwerem..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "Błąd otwarcia połączenia z API {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "" "Nie można połączyć się z serwerem OSM. Sprawdź swoje połączenie z Internetem." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14769,11 +14774,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16271,5 +16276,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Pusta warstwa" @@ -18312,10 +18317,10 @@ msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20314,25 +20319,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Zapisz plik" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Nazwa w menu" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "droga serwisowa" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Warstwy" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20340,45 +20342,41 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Błąd" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Nie znaleziono" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Nie rysuj linii pomiędzy punktami na tej warstwie." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "Adres serwera WMS" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "Niepoprawna nazwa użytkownika" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." msgstr "" @@ -20497,24 +20495,24 @@ "Może to spowodować powstanie błędnych współrzędnych." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Warstwa WMS ({0}), automatycznie pobrana w powiększeniu {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Warstwa WMS ({0}), pobrana w powiększeniu {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20525,67 +20523,67 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Pobierz widoczne kafle" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Zmień rozdzielczość" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Wczytaj ponownie błędne kafle" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Kanał alfa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Zapisz warstwę WMS do pliku" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Zapisz plik" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Otwórz warstwę WMS z pliku" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Otwórz warstwę WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Nieosługiwana wersja pliku WMS; znaleziono {0}, oczekiwano {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Błędny format pliku" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Błąd podczas ładowania pliku" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "Ustaw zakładkę WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Automatyczne pobieranie" @@ -20603,21 +20601,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Tworzy pustą warstwę WMS do załadowania danych z pliku" @@ -20640,7 +20643,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "Adres serwera WMS" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -34816,7 +34818,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Wpisz nazwę pozycji w menu oraz adres serwera WMS" - #~ msgid "Move" #~ msgstr "Przenieś" @@ -34995,4 +34994,7 @@ #~ msgid "Charge" #~ msgstr "Opłata" + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Wpisz nazwę pozycji w menu oraz adres serwera WMS" #~ msgid "help" Index: /applications/editors/josm/i18n/po/pt_BR.po =================================================================== --- /applications/editors/josm/i18n/po/pt_BR.po (revision 23003) +++ /applications/editors/josm/i18n/po/pt_BR.po (revision 23004) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-31 12:30+0000\n" -"Last-Translator: Nighto \n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 21:09+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Brazilian Portuguese \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-09-02 16:58+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -258,5 +258,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -428,5 +428,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -444,5 +444,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -620,10 +620,10 @@ "único conjunto de nós)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Combinar {0} caminhos" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Por favor selecione no mínimo 2 caminhos a combinar" @@ -674,5 +674,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -814,5 +814,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplicar" @@ -1545,8 +1545,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1605,6 +1605,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Erro" @@ -1770,5 +1770,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Não, abortar" @@ -3090,5 +3090,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3214,5 +3214,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Conflito duplo" @@ -3569,10 +3569,10 @@ msgstr "Aviso: falha ao persistir preferências para \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Erro no arquivo de configuração nas linhas {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3583,5 +3583,5 @@ "\"{0}\" não é uma directória." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3592,5 +3592,5 @@ "preferência \"{0}\" não é uma directória." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3601,5 +3601,5 @@ "falta da directória da preferência: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3610,5 +3610,5 @@ "devido a falta da directória da preferência: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3618,5 +3618,5 @@ "preferências base." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3627,5 +3627,5 @@ "ficheiro de preferência base." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3636,5 +3636,5 @@ "de preferências base: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3646,5 +3646,5 @@ "preferências base." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3655,10 +3655,10 @@ "preferências para original: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Erro: Linha ''{0}'' inesperada em arquivo de bookmarks ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4949,5 +4949,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4965,5 +4965,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5507,5 +5507,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6215,5 +6215,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 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" @@ -6296,5 +6296,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -8157,5 +8157,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8214,26 +8214,26 @@ msgstr "({0}/{1}): Baixando relação ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Tags e Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Relações de parentesco" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Relações-filho" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Aplicar papel:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Informe um papel e o aplique-o aos membros selecionados da relação." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -8245,14 +8245,14 @@ "deseja proceder em relação a dependências circulares?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Apagá-los, limpar relação" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignorá-los, deixar relação como está" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8264,9 +8264,9 @@ "\"{0}\"

      Você realmente deseja adicionar outro membro à relação?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Múltiplos membros referenciando a mesma primitiva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8279,5 +8279,5 @@ "\"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8286,5 +8286,5 @@ "membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8293,5 +8293,5 @@ "membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8301,5 +8301,5 @@ "membro selecionado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8309,15 +8309,15 @@ "membro selecionado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Remove todos os membros referentes ao um dos primitivos selecionados" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Editor de Relações: Remover Selecionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -8325,5 +8325,5 @@ "Selecionar membros da relação que referenciam primitivas na seleção atual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8333,64 +8333,64 @@ "Selecionar membros da relação que referenciam {0} primitivas na seleção atual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Selecione primitivas para as relações de membros selecionadas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Classificar a relação de membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Classificar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Editor de Relações: Classificar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Reverter a ordem dos membros da relação" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Inverter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Editor de Relações: Inverter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Mover os membros selecionados para cima" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Editor de Relações: Mover para cima" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Mover membros selecionados para baixo" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Editor de Relações: Mover para Baixo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Remover os membros atualmente selecionados dessa relação" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Editor de Relações: Remover" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Apagar a relação editada atual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8401,19 +8401,19 @@ "relações estava aberto. Eles foram removidos da lista de membros da relação." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Sim, crie um conflito e feche" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Clique para criar um conflito e fechar este editor de relações" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Não, continuar editando" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" @@ -8421,5 +8421,5 @@ "relação." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8431,5 +8431,5 @@ "fechar o editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8440,50 +8440,50 @@ "
      Por favor, primeiro resolva esse conflito e então tente de novo." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Aplciar as atualizações correntes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 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:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 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:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Adicionar uma tag vazia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Baixar todos os membros incompletos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Baixar membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Editor de Relações: Baixar Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Baixar membros incompletos selecionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 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:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Aplicar papel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8492,29 +8492,29 @@ msgstr[1] "Você está escolhendo um papel vazio em {0} primitivas." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Isso é igual a remover os papéis dessas primitivas." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "Você quer mesmo aplicar a nova regra?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Sim, aplique" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Não, não aplicar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Confirme papel vazio" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Editar relação referente à relação selecionada atualmente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8897,4 +8897,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12792,9 +12793,9 @@ msgstr "Configurar plugins disponíveis." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "Baixar plugins" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Você precicar reiniciar JOSM para aplicar mudanças." @@ -14052,11 +14053,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Código={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14536,10 +14537,10 @@ msgstr "Acessando Servidor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." @@ -14547,4 +14548,8 @@ "Não foi possível conectar com o servidor OSM. Por favor, verifique sua " "conexão de internet." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -15298,11 +15303,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "Aviso: falha ao manipular arquivo zip ''{0}''. A exceção foi: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16821,5 +16826,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Camada vazia" @@ -18863,10 +18868,10 @@ msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20898,25 +20903,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Salvar camada WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Nome do Menu" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Serviço" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Camadas" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20924,49 +20926,43 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Erro" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Limites" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Não desenhar linhas entre pontos para esta camada." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "URL do WMS" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "URL inválido?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." -msgstr "Selecionar a primeira camada WMS da lista." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "Selecionar a primeira camada WMS da lista." +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -21081,24 +21077,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -21109,67 +21105,67 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "Sim, buscar imagens" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "URL inválido?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Baixar imagens visíveis" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Mudar resolução" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Recarregar imagens erradas" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Canal alfa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Salvar camada WMS para arquivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Salvar camada WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Carregar camada WMS de um arquivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Carregar camada WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Erro no formato do arquivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Erro ao carregar arquivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "Adicionar marcador para esta camada WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Download automático" @@ -21187,21 +21183,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Abrir uma camada WMS em branco para carregar dados de um arquivo" @@ -21224,7 +21225,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "URL do WMS" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -35415,7 +35415,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Digite o nome do menu e a URL do WMS" - #~ msgid "Uploading..." #~ msgstr "Enviando..." @@ -36474,4 +36471,7 @@ #~ msgstr "Pontos GPS" +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Digite o nome do menu e a URL do WMS" + #~ msgid "" #~ "There is {0} additional primitive referred to by relation {1}
      which is " Index: /applications/editors/josm/i18n/po/ro.po =================================================================== --- /applications/editors/josm/i18n/po/ro.po (revision 23003) +++ /applications/editors/josm/i18n/po/ro.po (revision 23004) @@ -8,6 +8,6 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 22:48+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 20:51+0000\n" "Last-Translator: Dirk Stöcker \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-09-02 16:58+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: ROMANIA\n" @@ -74,7 +74,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -90,5 +90,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -252,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:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -422,5 +422,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -438,5 +438,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -612,10 +612,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Combină {0} căi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Selectează te rog cel puţin două căi pentru a le combina." @@ -666,5 +666,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -806,5 +806,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplicare" @@ -1505,8 +1505,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1565,6 +1565,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Eroare" @@ -1727,5 +1727,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "" @@ -2950,5 +2950,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3072,5 +3072,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3412,10 +3412,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3424,5 +3424,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3431,5 +3431,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3438,5 +3438,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3445,5 +3445,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3451,5 +3451,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3458,5 +3458,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3465,5 +3465,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3472,5 +3472,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3479,10 +3479,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4715,5 +4715,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4731,5 +4731,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5238,5 +5238,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5911,5 +5911,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5992,5 +5992,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7777,5 +7777,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7832,26 +7832,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +msgid "Apply Role:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 -msgid "Apply Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -7860,14 +7860,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7877,9 +7877,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7889,15 +7889,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7905,5 +7905,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7911,20 +7911,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7933,64 +7933,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +msgid "Sort the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 -msgid "Sort the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 +msgid "Reverse the order of the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 -msgid "Reverse the order of the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7999,23 +7999,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8024,5 +8024,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8031,50 +8031,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 +msgid "Download all incomplete members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 -msgid "Download all incomplete members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +msgid "Sets a role for the selected members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 -msgid "Sets a role for the selected members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8083,29 +8083,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8469,4 +8469,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12079,9 +12080,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Trebui să reponiţi JOSM pentru ca anumite opţiuni să aibă efect." @@ -13294,11 +13295,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -13770,12 +13771,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." msgstr "" @@ -14506,11 +14511,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16001,5 +16006,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "" @@ -18036,10 +18041,10 @@ msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20032,24 +20037,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Salvează strat WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Straturi" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20057,43 +20060,41 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Eroare" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -msgid "Show Bounds" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Nu trasa linii între puncte pentru acest strat." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." msgstr "" @@ -20210,24 +20211,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20238,67 +20239,67 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Salvează strat WMS în fișier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Salvează strat WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "" @@ -20316,21 +20317,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "" Index: /applications/editors/josm/i18n/po/ru.po =================================================================== --- /applications/editors/josm/i18n/po/ru.po (revision 23003) +++ /applications/editors/josm/i18n/po/ru.po (revision 23004) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 22:08+0000\n" -"Last-Translator: bastik \n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 22:13+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Koptev Oleg \n" "MIME-Version: 1.0\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-09-02 16:57+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" @@ -73,7 +73,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -89,5 +89,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -258,5 +258,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -430,5 +430,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -446,5 +446,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -623,10 +623,10 @@ "последовательностью точек." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Объединить {0} линии" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Выделите не менее двух линий для объединения." @@ -676,5 +676,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -814,5 +814,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Дублировать" @@ -1558,8 +1558,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1618,6 +1618,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Ошибка" @@ -1784,5 +1784,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Нет, прервать" @@ -3126,5 +3126,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3251,5 +3251,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Двойной конфликт" @@ -3611,10 +3611,10 @@ msgstr "Предупреждение: не удается сохранить настройки в ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Ошибка в файле конфигурации на строках {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3625,5 +3625,5 @@ "не является каталогом." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3634,5 +3634,5 @@ "является каталогом." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3643,5 +3643,5 @@ "отсутствующий каталог настроек: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3652,5 +3652,5 @@ "каталог настроек: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3660,5 +3660,5 @@ "параметрами по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3669,5 +3669,5 @@ "параметров по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3678,5 +3678,5 @@ "к состоянию по умолчанию: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3687,5 +3687,5 @@ "резервный
      {0}
      а новый будет создан с параметрами по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3696,10 +3696,10 @@ "настроек {0} к состоянию по умолчанию." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Ошибка: Неожиданная строка ''{0}'' в файле закладок ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4995,5 +4995,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -5011,5 +5011,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5555,5 +5555,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6257,5 +6257,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Создать копию этого отношения и открыть его в другом окне редактора" @@ -6338,5 +6338,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -8192,5 +8192,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8259,26 +8259,26 @@ msgstr "({0}/{1}): Скачивание отношения ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Теги и участники" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Родительские отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Дочерние элементы отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Применить роль:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Ввести роль и применить её на выделенных участников отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -8290,14 +8290,14 @@ "хотите продолжать с циклическими отношениями?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Удалить их, почистить отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Игнорировать их, оставить отношение как есть" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8310,9 +8310,9 @@ "участника отношения?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Несколько участников, относящихся к одному и тому же элементу" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8325,5 +8325,5 @@ "''{0}'' будет пропущено." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8332,5 +8332,5 @@ "участником" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8339,5 +8339,5 @@ "участника" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8347,5 +8347,5 @@ "выделенным участником" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8355,20 +8355,20 @@ "выделенного участника" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Удалить всех участников, относящихся к каждому из выделенных элементов" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Редактор отношений: удалить выделенное" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Выделить участников отношения, которые относятся к выбранным элементам" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8379,64 +8379,64 @@ "выделенных элементов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Выделить элементы для выделенных участников отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Сортировать участников отношений" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Сортировать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Редактор отношений: сортировать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Поменять порядок участников отношения на обратный" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "В обратном порядке" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Редактор отношений: Наоборот" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Переместить выделенных участников отношения вверх" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Редактор отношений: поднять" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Переместить выделенных участников отношения вниз" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Редактор отношений: опустить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Удалить отмеченных участников из отношения" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Редактор отношений: удалить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Удалить редактируемое отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8448,19 +8448,19 @@ "был открыт. Они были удалены из списка участников отношений." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Да, создать конфликт и закрыть" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Щёлкните, чтобы создать конфликт и закрыть этот редактор отношений" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Нет, продолжить редактирование" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" @@ -8468,5 +8468,5 @@ "отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8478,5 +8478,5 @@ "создать конфликт и закрыть редактор?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8487,50 +8487,50 @@ "
      Пожалуйста, уладьте этот конфликт, прежде чем продолжать." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Записать внесённые изменения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Применить обновления и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Отменить обновления и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Добавить пустой тег" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Скачать всех неполных участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Редактор отношений: скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Скачать с сервера выделенных неполных участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Задать роль для выделенных участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Применить роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8540,29 +8540,29 @@ msgstr[2] "Вы назначили пустую роль на {0} элементов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Это эквивалентно удалению ролей из этих элементов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "Вы действительно хотите назначить новую роль?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Да, записать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Нет, не записывать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Подтвердить пустую роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Выделенный, при редактировании отношения, участник относится к" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8948,4 +8948,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12972,9 +12973,9 @@ msgstr "Настроить доступные модули." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "Скачать модули" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу." @@ -14302,11 +14303,11 @@ "идентификатором {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Код={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14821,10 +14822,10 @@ msgstr "Соединение с сервером..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "Не удалось установить соединение с API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." @@ -14832,4 +14833,8 @@ "Не удается соединиться с сервером OSM. Пожалуйста, проверьте Ваше интернет-" "соединение." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -15689,5 +15694,5 @@ "проблема конфигурации. JOSM прекращает работу." -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" @@ -15695,6 +15700,6 @@ "Предупреждение: не удалось обработать файл .zip {0}''. Текст ошибки: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -17349,5 +17354,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Пустой слой" @@ -19441,10 +19446,10 @@ msgstr "Ряд домов вдоль улицы" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "Редактировать OpenSeaMap" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "Редактор морских объектов Seamark Editor" @@ -21578,25 +21583,22 @@ msgstr "Выберите не разветвляющиеся последовательности линий" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Сохранить WMS слой" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Название меню" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Служебная" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Слои" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -21604,49 +21606,43 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Ошибка" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Границы" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Не отображать линии между точками для этого слоя." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "Ссылка на WMS" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "Ошибочная ссылка?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." -msgstr "Сначала выберите слой WMS в списке." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "Сначала выберите слой WMS в списке." +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -21771,5 +21767,5 @@ "Это может привести к ошибочным координатам." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -21778,19 +21774,19 @@ "искажена" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(деактивировано)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -21805,17 +21801,17 @@ "попытаться извлечь квадраты WMS?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "Да, выбрать изображения" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "Ошибочная ссылка?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Скачать видимые квадраты карты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -21824,33 +21820,33 @@ "измените разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Изменить разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Загрузить заново ошибочные квадраты карты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Альфа канал" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Сохранить слой WMS в файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Сохранить WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Загрузить слой WMS из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Загрузить WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -21858,17 +21854,17 @@ "Неподдерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Ошибка формата файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Ошибка при загрузке файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "Установить закладку WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Автоматическое скачивание" @@ -21886,21 +21882,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Открыть пустой WMS-слой для загрузки данных из файла" @@ -21923,7 +21924,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "Ссылка на WMS" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -36172,7 +36172,4 @@ msgstr "PCN 2006 — Италия" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Введите имя пункта меню и URL этого WMS" - #~ msgid "No data imported." #~ msgstr "Данные не импортированы" @@ -36846,4 +36843,7 @@ #~ msgid "Open User Page" #~ msgstr "Открыть страницу пользователя" + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Введите имя пункта меню и URL этого WMS" #~ msgid "Please select the row to copy." Index: /applications/editors/josm/i18n/po/sk.po =================================================================== --- /applications/editors/josm/i18n/po/sk.po (revision 23003) +++ /applications/editors/josm/i18n/po/sk.po (revision 23004) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-31 03:48+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-05 11:36+0000\n" "Last-Translator: Vlado \n" "Language-Team: Slovak \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-09-02 17:01+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -255,5 +255,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -425,5 +425,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -441,5 +441,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -615,10 +615,10 @@ msgstr "Nemôžem spojiť cesty (Nemôžu byť spojené do jedného reťazca bodov)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Spojiť {0} ciest" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Prosím, vyberte aspoň dve cesty pre spojenie." @@ -669,5 +669,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -807,5 +807,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplikovať" @@ -1540,8 +1540,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1600,6 +1600,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Chyba" @@ -1607,5 +1607,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:54 msgid "Reverse way" -msgstr "" +msgstr "Otočiť smer cesty" #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:67 @@ -1766,5 +1766,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Nie, zrušiť" @@ -3094,5 +3094,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3219,5 +3219,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Dvojitý konflikt" @@ -3579,10 +3579,10 @@ msgstr "VAROVANIE: neúspešný pri pokračovaní preferancií na ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Poškodený konfiguračný súbor pri linke {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3593,5 +3593,5 @@ "nie je adresár." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3602,5 +3602,5 @@ "nie je adresár." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3611,5 +3611,5 @@ "chýbajúceho adresára preferencií: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3620,5 +3620,5 @@ "chýbajúceho adresára preferencií: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3628,5 +3628,5 @@ "súboru preferencií." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3637,5 +3637,5 @@ "súborom preferencií." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3646,5 +3646,5 @@ "preferencií do východzieho: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3655,5 +3655,5 @@ "súboru
      {0}
      a vytváranie nového východzieho súboru." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3664,10 +3664,10 @@ "preferencií do východzích: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Chyba: Neočakávaný riadok ''{0}'' v súbore záložiek ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4773,5 +4773,5 @@ #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764 msgid "Imperial" -msgstr "" +msgstr "Britský" #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50 @@ -4959,5 +4959,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4975,5 +4975,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5515,5 +5515,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5994,5 +5994,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57 msgid "Error in filter" -msgstr "" +msgstr "Chyba vo filtri" #. translators notes must be in front @@ -6220,5 +6220,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 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" @@ -6301,5 +6301,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -8153,5 +8153,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8215,26 +8215,26 @@ msgstr "({0}/{1}): Sťahujem reláciu ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Značky a Členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Nadradené vzťahy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Odvodená relácia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Použiť Funkciu:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Vložiť funkciu a použiť na vybraté členy relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -8246,14 +8246,14 @@ "chcete pokračovať s kruhovou závislosťou?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Odstraňte ich, vyčistite reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignorujte ich, nechajte reláciu tak ako je" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8266,9 +8266,9 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Viacnásobné členy odkazujú na rovnaké obecné" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8280,5 +8280,5 @@ "odkazy a je preto znechutený.
      Vynechanie relácie ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8286,5 +8286,5 @@ "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade pred prvým členom" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8292,5 +8292,5 @@ "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade za posledným členom" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8300,5 +8300,5 @@ "členom" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8308,20 +8308,20 @@ "členom" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Editor Relácií: Odstrániť Vybrané" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Vybrať člena relácie, ktorý sa týka pôvodných v aktuálnom výbere" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8331,64 +8331,64 @@ "Vybrať člena relácie, ktorý odkazuje na {0} pôvodných v aktuálnom výbere" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Výber pôvodných pre vybraté členy relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Triedenie členov relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Triediť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Editor Relácií: Triedenie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Obrátiť poradie členov relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Obrátene" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Editor relácie: Obrátenie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Pridať všetky zvolené objekty medzi členy" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Editor Relácií: Posun Hore" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Presunúť zvolenú vrstvu o riadok dolu." #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Editor Relácií: Posun Dole" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Odstrániť práve vybraté členy z tejto relácie" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Editor Relácií: Odstrániť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Vymazať práve vydanú reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8400,24 +8400,24 @@ "bol otvorený. Mali by byť odstránené z obsahu členov relácie." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Áno, vyriešiť konflikt a zavrieť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 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:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Nie, pokračovať v editácii" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" "Kliknutím sa vrátite do editora relácie na pokračovanie v úprave relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8429,5 +8429,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8438,50 +8438,50 @@ "rozhodnite najskôr tento konflikt, potom skúste znovu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Použiť súčasnú aktuálizáciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 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:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 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:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Pridať prázdnu značku" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Stiahnuť všetký nekompletné členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Stiahnuť členov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Editor Relácií: Sťahovanie Členov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Stiahnuť vybraté nekompletné členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Nastavenie funkcie pre vybrané členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Použiť Funkciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8491,33 +8491,35 @@ msgstr[2] "Nastavili ste prázdnu funkciu na {0} pôvodých." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Toto sa rovná vymazaniu funkcií týchto pôvodných." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 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:1343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Áno, Použiť to" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Nie, použite to" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Potvrdiť prázdnu funkciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 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" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " "current layer" msgstr "" +"Členy z pamäte nie je možné pridať, pretože nie sú zahrnuté do aktuálnej " +"vrstvy" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8689,5 +8691,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114 msgid "Clear textarea" -msgstr "" +msgstr "Vymazať textarea" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123 @@ -8891,4 +8893,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -9329,5 +9332,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51 msgid "Enter an upload comment" -msgstr "" +msgstr "Zadajte nejaký komentár" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 @@ -9876,13 +9879,13 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370 msgid "Please revise upload comment" -msgstr "" +msgstr "Prosím opravte komentár" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371 msgid "Revise" -msgstr "" +msgstr "Kontrola" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371 msgid "Continue as is" -msgstr "" +msgstr "Pokračovať, ako je" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373 @@ -9894,20 +9897,26 @@ "explain your change, you will make life
      easier for many other mappers." msgstr "" +"Váš komentár pre nahrávanie je prázdny, alebo veľmi krátky." +"

      Toto je technicky povolené, ale domnievame sa, že veľa " +"užívateľov, ktorí si
      sledujú zmeny v ich oblasti závisí na " +"zmysluplných komentároch zmenových súborov
      ,aby pochopili, čo sa " +"deje!

      Ak obetujete minútu navyše teraz vysvetlením vašich " +"zmien, urobíte život
      jednoduchším pre mnoho iných používateľov." #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388 msgid "Return to the previous dialog to enter a more descriptive comment" -msgstr "" +msgstr "Návrat na predchádzajúci dialóg pre zadanie podrobnejšieho komentára" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389 msgid "Cancel and return to the previous dialog" -msgstr "" +msgstr "Zrušiť a návrat na predchádzajúci dialóg" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390 msgid "Ignore this hint and upload anyway" -msgstr "" +msgstr "Ignorovať tento tip a nahrať bez zmeny" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393 msgid "Do not show this message again" -msgstr "" +msgstr "Túto správu už znovu nezobrazovať" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401 @@ -10338,5 +10347,5 @@ #, java-format msgid "Length: {0}" -msgstr "" +msgstr "Dĺžka: {0}" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203 @@ -12088,5 +12097,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49 msgid "Auto save interval (seconds)" -msgstr "" +msgstr "Interval pre automatické ukladanie (v sekundách)" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52 @@ -12094,9 +12103,9 @@ #, java-format msgid "Default value: {0}" -msgstr "" +msgstr "Predvolená hodnota: {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56 msgid "Auto saved files per layer" -msgstr "" +msgstr "Súbory automatického ukladania pre vrstvu" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64 @@ -12106,8 +12115,11 @@ "tries to recover the unsaved changes on next start.)      " msgstr "" +"(Automatické ukladanie zmenilo údaje vrstvy v pravidelných intervaloch. " +"Zálohy sú ukladané do priečinka JOSMu v nastaveniach. V prípade havárie, sa " +"JOSM snaží obnoviť neuložené zmeny na ďalší štart.)" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72 msgid "Keep backup files when saving data layers" -msgstr "" +msgstr "Zachovať záložné súbory pri ukladaní dátových vrstiev" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74 @@ -12327,5 +12339,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62 msgid "Auto" -msgstr "" +msgstr "Automaticky" #. gpx data field name @@ -12333,5 +12345,5 @@ msgctxt "gpx_field" msgid "Name" -msgstr "" +msgstr "Názov" #. gpx data field name @@ -12343,5 +12355,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63 msgid "Both" -msgstr "" +msgstr "Oba" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72 @@ -12445,9 +12457,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213 msgid "Allows to change the labelling of track waypoints." -msgstr "" +msgstr "Umožňuje meniť označenie bodov stopy(track)." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214 msgid "Waypoint labelling" -msgstr "" +msgstr "Značenie bodov" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220 @@ -12859,9 +12871,9 @@ msgstr "Nastavenie dostupných pluginov." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "Stiahnuť pluginy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Niektoré nastavenia sa prejavia až po reštartovaní JOSM." @@ -12881,5 +12893,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153 msgid "System of measurement" -msgstr "" +msgstr "Systém merania" #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 @@ -13023,9 +13035,10 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 msgid "Internal style" -msgstr "" +msgstr "Interné štýly" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766 msgid "Internal style to be used as base for runtime switchable overlay styles" msgstr "" +"Interné štýly majú byť použité ako základ pre prevádzkové prepínateľné štýly" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787 @@ -14164,11 +14177,11 @@ msgstr "Otvoriť očakávaný zmenový súbor. Got zavretý zmenový súbor s id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Kód={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14675,10 +14688,10 @@ msgstr "Kontaktujem server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "Neúspešné nadviazanie spojenia do API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." @@ -14686,4 +14699,8 @@ "Nemôžem sa pripojiť k OSM serveru. Prosím skontrolujte si pripojenie k " "internetu." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -15547,5 +15564,5 @@ "problém. JOSM prestane pracovať." -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" @@ -15553,6 +15570,6 @@ "Varovanie: Nepodarilo sa spracovať zip súbor ''{0}''. Výnimka bola: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -17128,5 +17145,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Prázdna vrstva" @@ -19204,10 +19221,10 @@ msgstr "Rad (Terrace)" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -21322,25 +21339,22 @@ msgstr "Vybrať nerozvetvené časti ciest" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Uložiť WMS vrstvu" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Meno v menu" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Obslužná cesta (Service)" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Vrstvy" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -21348,49 +21362,43 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Chyba" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Hranice" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "Chybná URL?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." -msgstr "Zvoľte najprv WMS vrstvu v zozname." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "Zvoľte najprv WMS vrstvu v zozname." +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -21512,5 +21520,5 @@ "Môže to viesť k zlým súradniciam." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -21518,19 +21526,19 @@ "Varovanie: WMS vrstva je deaktivovaná, pretože je obsahuje chybnú url ''{0}''" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(deaktivované)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS vrstva ({0}), sa automaticky sťahuje vo zväčšení (zoom) {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -21545,17 +21553,17 @@ "
      Chcete doniesť WMS dlaždice aj napriek tomu?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "Áno, stiahni obrázky" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "Chybná URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Stiahnuť viditeľné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -21563,50 +21571,50 @@ "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Zmena rozlíšenia" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Nahrať poškodené dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Uložiť WMS vrstvu do súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Uložiť WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Nahrať WMS vrstvu zo súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Načítať WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Nepodporovaná verzia WMS súboru; nájdené {0}, očakávané {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Chyba formátu súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Chyba pri nahrávaní súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "Nastaviť WMS Záložku" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Automatické sťahovanie" @@ -21624,21 +21632,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Otvoriť prázdnu WMS vrstvu, aby sa nahrali dáta zo súboru" @@ -21661,7 +21674,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMS URL" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -35899,7 +35911,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Zadajte meno v menu a WMS URL" - #~ msgid "Move" #~ msgstr "Presunúť" @@ -36243,4 +36252,7 @@ #~ msgid "error loading metadata" #~ msgstr "chyba pri zavádzaní metadát" + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Zadajte meno v menu a WMS URL" #~ msgid "Copy Default" Index: /applications/editors/josm/i18n/po/sl.po =================================================================== --- /applications/editors/josm/i18n/po/sl.po (revision 23003) +++ /applications/editors/josm/i18n/po/sl.po (revision 23004) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-06-28 15:54+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 21:51+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-09-02 16:56+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -87,5 +87,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -249,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:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -417,5 +417,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -433,5 +433,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -605,10 +605,10 @@ msgstr "Poti se ne da združiti (Vozlišča niso povezana v premem zaporedju)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Združi {0} poti" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "" @@ -657,5 +657,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -795,5 +795,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Podvoji" @@ -1494,8 +1494,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1554,6 +1554,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Napaka" @@ -1715,5 +1715,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "" @@ -2948,5 +2948,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3070,5 +3070,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3409,10 +3409,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3421,5 +3421,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3428,5 +3428,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3435,5 +3435,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3442,5 +3442,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3448,5 +3448,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3455,5 +3455,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3462,5 +3462,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3469,5 +3469,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3476,10 +3476,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4720,5 +4720,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4736,5 +4736,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5243,5 +5243,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5912,5 +5912,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5993,5 +5993,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7781,5 +7781,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7836,26 +7836,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +msgid "Apply Role:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 -msgid "Apply Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -7864,14 +7864,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7881,9 +7881,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7893,15 +7893,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7909,5 +7909,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7915,20 +7915,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7937,64 +7937,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +msgid "Sort the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 -msgid "Sort the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 +msgid "Reverse the order of the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 -msgid "Reverse the order of the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Pomakni izbranega člana vrstico višje." #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Pomakni izbranega člana vrstico nižje." #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8003,23 +8003,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8028,5 +8028,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8035,50 +8035,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 +msgid "Download all incomplete members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 -msgid "Download all incomplete members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +msgid "Sets a role for the selected members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 -msgid "Sets a role for the selected members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8087,29 +8087,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8475,4 +8475,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12085,9 +12086,9 @@ msgstr "Nastavi razpoložljive vstavke." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Za upoštevanje nekaterih sprememb je potrebno ponovno zagnati JOSM." @@ -13305,11 +13306,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -13781,10 +13782,10 @@ msgstr "Vzpostavljanje povezave s strežnikom..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." @@ -13792,4 +13793,8 @@ "Ni se bilo mogoče povezati s strežnikom OSM. Preverite vašo povezavo z " "internetom." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14523,11 +14528,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16018,5 +16023,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Prazna plast" @@ -18055,10 +18060,10 @@ msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20052,24 +20057,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Plast WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Naziv v meniju" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Plasti" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20077,43 +20080,41 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Napaka" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -msgid "Show Bounds" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Ne riši povezav med točkami na tej plasti." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "Povezava do WMS" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." msgstr "" @@ -20230,24 +20231,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20258,67 +20259,67 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Naloži vidne ploščice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Spremeni ločljivost" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Shrani plast WMS v datoteko" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Naloži plast WMS iz datoteke" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Nepodprta različica datoteke WMS; našel {0}, pričakoval {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Samodejno sprejemanje" @@ -20336,21 +20337,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Odpri prazno plast WMS za nalaganje podatkov iz datoteke" @@ -20373,7 +20379,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "Povezava do WMS" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -34545,7 +34550,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Vpišite ime za meni in povezavo do WMS" - #~ msgid "Move" #~ msgstr "Premakni" @@ -34701,4 +34703,7 @@ #~ msgstr "Geslo na posredovalnem strežniku" +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Vpišite ime za meni in povezavo do WMS" + #~ msgid "Edit Station" #~ msgstr "Uredi postajo" Index: /applications/editors/josm/i18n/po/sv.po =================================================================== --- /applications/editors/josm/i18n/po/sv.po (revision 23003) +++ /applications/editors/josm/i18n/po/sv.po (revision 23004) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-06-07 08:48+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 22:06+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Swedish \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-09-02 16:59+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -254,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:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -424,5 +424,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -440,5 +440,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -616,10 +616,10 @@ "noder av dem)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "Slå ihop {0} sträckor" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Välj åtminstone två sträckor att slå ihop" @@ -670,5 +670,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -809,5 +809,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplicera" @@ -1526,8 +1526,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1586,6 +1586,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Fel" @@ -1751,5 +1751,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Nej, avbryt" @@ -3042,5 +3042,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3164,5 +3164,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Dubbel konflikt" @@ -3510,10 +3510,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Fel i konfigurationsfilen på raderna {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3522,5 +3522,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3529,5 +3529,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3536,5 +3536,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3543,5 +3543,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3549,5 +3549,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3556,5 +3556,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3563,5 +3563,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3570,5 +3570,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3577,10 +3577,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4817,5 +4817,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4833,5 +4833,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5340,5 +5340,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6010,5 +6010,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -6091,5 +6091,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7877,5 +7877,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7932,26 +7932,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +msgid "Apply Role:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 -msgid "Apply Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -7960,14 +7960,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7977,9 +7977,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7989,15 +7989,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8005,5 +8005,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8011,20 +8011,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8033,64 +8033,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +msgid "Sort the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 -msgid "Sort the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 +msgid "Reverse the order of the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 -msgid "Reverse the order of the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Flytta vald medlem/valda medlemmar uppåt" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Flytta vald medlem/valda medlemmar nedåt" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8099,23 +8099,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8124,5 +8124,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8131,50 +8131,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 +msgid "Download all incomplete members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 -msgid "Download all incomplete members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Hämta medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +msgid "Sets a role for the selected members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 -msgid "Sets a role for the selected members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8183,29 +8183,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8572,4 +8572,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12235,9 +12236,9 @@ msgstr "Ställ in tillgängliga insticksmoduler." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -13454,11 +13455,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -13930,14 +13931,18 @@ msgstr "Tar kontakt med servern..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "" "Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14678,11 +14683,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16187,5 +16192,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Tomt lager" @@ -18254,10 +18259,10 @@ msgstr "Husrad" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20275,25 +20280,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "WMS-lager" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Menynamn" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Tillfartsväg" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Lager" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20301,43 +20303,41 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Fel" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -msgid "Show Bounds" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Rita inte linjer mellan punkter i detta lager." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "URL för WMS" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." msgstr "" @@ -20454,24 +20454,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-lager ({0}), hämtas automatiskt i zoomläge {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-lager ({0}), hämtas i zoomläge {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20482,67 +20482,67 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Hämta de rutor som syns" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "Den begärda ytan är för stor. Zooma in lite eller ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Läs om felaktiga rutor" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Alfakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Spara WMS-lagret till en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Hämta WMS-lager från en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "WMS-filversion som ej stöds; funnen {0}, förväntad {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Fel filformat" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Fel vid läsning av fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Automatisk hämtning" @@ -20560,21 +20560,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Öppna ett tomt WMS-lager för att läsa in data från en fil" @@ -20598,7 +20603,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "URL för WMS" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -34776,7 +34780,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Ange ett menynamn och en URL för WMS" - #~ msgid "Move" #~ msgstr "Flytta" @@ -35056,4 +35057,7 @@ #~ msgid "Add a new tagging preset source to the list." #~ msgstr "Lägg till en källa för snabbval för taggning till listan." + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Ange ett menynamn och en URL för WMS" #~ msgid "YAHOO (GNOME)" Index: /applications/editors/josm/i18n/po/tr.po =================================================================== --- /applications/editors/josm/i18n/po/tr.po (revision 23003) +++ /applications/editors/josm/i18n/po/tr.po (revision 23004) @@ -10,6 +10,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 23:06+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 21:36+0000\n" "Last-Translator: Angel Spy \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-09-02 16:59+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -72,7 +72,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -88,5 +88,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -252,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:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -420,5 +420,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -436,5 +436,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -610,10 +610,10 @@ msgstr "Yollar birleştiriledi (Tek bir yoluna konulamadı)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "{0} yol birleştir" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Lütfen birleştirmek için en az iki yol seçiniz." @@ -664,5 +664,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -802,5 +802,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Çift" @@ -1500,8 +1500,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1560,6 +1560,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Hata" @@ -1722,5 +1722,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "" @@ -2961,5 +2961,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3083,5 +3083,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3426,10 +3426,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3438,5 +3438,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3445,5 +3445,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3452,5 +3452,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3459,5 +3459,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3465,5 +3465,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3472,5 +3472,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3479,5 +3479,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3486,5 +3486,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3493,10 +3493,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4729,5 +4729,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4745,5 +4745,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5252,5 +5252,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5919,5 +5919,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -6000,5 +6000,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7782,5 +7782,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7837,26 +7837,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 +msgid "Parent Relations" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 -msgid "Parent Relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +msgid "Apply Role:" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 -msgid "Apply Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -7865,14 +7865,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7882,9 +7882,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7894,15 +7894,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7910,5 +7910,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7916,20 +7916,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7938,64 +7938,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +msgid "Sort the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 -msgid "Sort the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 +msgid "Reverse the order of the relation members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 -msgid "Reverse the order of the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Seçili üyeyi yukarı taşı" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Seçili üyeyi aşağı taşı" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8004,23 +8004,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8029,5 +8029,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8036,50 +8036,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 +msgid "Download all incomplete members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 -msgid "Download all incomplete members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Üyeleri İndir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +msgid "Sets a role for the selected members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 -msgid "Sets a role for the selected members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8088,29 +8088,29 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8474,4 +8474,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12094,9 +12095,9 @@ msgstr "Yüklü eklentileri ayarla." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Ayarların aktif olamsı için programı açıp/kapatmalısınız." @@ -13311,11 +13312,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -13787,10 +13788,10 @@ msgstr "Server'e bağlanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." @@ -13798,4 +13799,8 @@ "OSM server'ına bağlantı sağlanamadı. Lütfen internet bağlantınızı kontol " "ediniz." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14528,11 +14533,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16030,5 +16035,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Boş Tabaka" @@ -18082,10 +18087,10 @@ msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20089,25 +20094,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "WMS Tabakası" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Menu İsmi" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Servis" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Tabakalar" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20115,43 +20117,41 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Hata" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -msgid "Show Bounds" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Bu tabaka için çizgileri birleştirme." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMS linki" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." msgstr "" @@ -20268,24 +20268,24 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS tabaksı ({0}), otomatik indirildi, görüntü seviyesi {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS tabakası ({0}), görüntü seviyesi {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20296,17 +20296,17 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Görünen mozaikleri indir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20315,50 +20315,50 @@ "değiştirin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Çözünürlüğü değiştir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "WMS tabakasını dosyaya kaydet" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "WMS tabakasını dosyadan yükle" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Desteklenmeyen WMS versiyonu; bulunan {0}, istenen {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Dosya Format Hatası" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Dosya Yüklemede Sorun" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Otomatik indir" @@ -20376,21 +20376,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Veri yüklemek için boş bir WMS tabakası aç" @@ -20413,7 +20418,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMS linki" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -34589,7 +34593,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Menu ismi ve WMS linki kullanınız" - #~ msgid "" #~ "The plugin could not be removed. Please tell the people you got JOSM from " @@ -35153,4 +35154,7 @@ #~ msgid "rectifier id={0}" #~ msgstr "rectifier id={0}" + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Menu ismi ve WMS linki kullanınız" #~ msgid "Please select the row to copy." Index: /applications/editors/josm/i18n/po/uk.po =================================================================== --- /applications/editors/josm/i18n/po/uk.po (revision 23003) +++ /applications/editors/josm/i18n/po/uk.po (revision 23004) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-09-01 21:03+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-05 19:49+0000\n" "Last-Translator: andygol \n" "Language-Team: Ukrainian \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-09-02 16:53+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -87,5 +87,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -257,5 +257,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -429,5 +429,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -445,5 +445,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -619,10 +619,10 @@ msgstr "Не вдалося з’єднати лінії (Неможливо створити єдиний ланцюг з вузлів)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "З’єднати лінії — {0} шт." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "Будь ласка, виберіть принаймні дві лінії для з’єднання" @@ -672,5 +672,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -812,5 +812,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Дублювати" @@ -1556,8 +1556,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1616,6 +1616,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "Помилка" @@ -1782,5 +1782,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "Ні, скасувати" @@ -3125,5 +3125,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3250,5 +3250,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Подвійний конфлікт" @@ -3610,10 +3610,10 @@ msgstr "Попередження: не зберігаються налаштування у ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "Файл налаштувань спотворено; рядок {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3624,5 +3624,5 @@ "є каталогом." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3633,5 +3633,5 @@ "каталогом." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3642,5 +3642,5 @@ "каталог для налаштувань: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3651,5 +3651,5 @@ "каталог для налаштувань: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3659,5 +3659,5 @@ "налаштувань." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3668,5 +3668,5 @@ "типовими налаштуваннями." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3677,5 +3677,5 @@ "на файл з типовими налаштуваннями: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3686,5 +3686,5 @@ "
      {0}
      та створено новий файл з типовими налаштуваннями." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3695,10 +3695,10 @@ "налаштувань {0} на файл з типовими налаштуваннями." -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "Помилка: Неочікуваний рядок ''{0}'' у файлі закладок ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4126,5 +4126,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297 msgid "North" -msgstr "Північ" +msgstr "Північна" #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442 @@ -4134,5 +4134,5 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446 msgid "Hemisphere" -msgstr "Напівсферична" +msgstr "Півкуля" #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455 @@ -4999,5 +4999,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -5015,5 +5015,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5558,5 +5558,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -6256,5 +6256,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Створити копію цього зв’язку і відкрити його в іншому вікні редактора" @@ -6337,5 +6337,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -8185,5 +8185,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8246,26 +8246,26 @@ msgstr "({0}/{1}): Завантаження зв’язку ''{2}''…" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Теґи та члени" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Батьківські зв’язки" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Підпорядковані зв’язки" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Застосувати роль:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Ввести роль та застосувати її до виділених членів зв’язку" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -8277,14 +8277,14 @@ "циклічними залежностями?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Вилучити їх із зв’язку" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ігнорувати, залишити зв’язок як є" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8297,9 +8297,9 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Кілька членів посилаються на один і той же елемент" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8312,5 +8312,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8318,5 +8318,5 @@ "Додати всі елементи, виділені в поточному наборі даних, перед першим членом" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8325,5 +8325,5 @@ "члена" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8333,5 +8333,5 @@ "виділеним членом" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8341,20 +8341,20 @@ "виділеного члена" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Вилучити всіх членів, що відносяться до любого з виділених елементів" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Редактор зв’язків: Вилучити виділене" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Виділити членів зв’язку, які відносяться до вибраних елементів" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8365,64 +8365,64 @@ "елементів" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Виділити елементи для виділених членів зв’язку" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Впорядкувати членів зв’язку" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Впорядкувати" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Редактор зв’язків: Впорядкувати" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Змінити порядок членів зв’язку на протилежний" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "У зворотному порядку" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Редактор зв’язків: Навпаки" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Перемістити обраних членів вгору" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Редактор зв’язків: Підняти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Перемістити обраних членів вниз" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Редактор зв’язків: Опустити" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Вилучити виділених членів зі зв’язку" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Редактор зв’язків: Вилучити" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Вилучити зв’язок, що редагується" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8434,24 +8434,24 @@ "був відкритий. Вони були вилучені зі списку членів зв’язку." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Так, створити конфлікт і закрити" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Натисніть, щоб створити конфлікт і закрити редактор зв’язків" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Ні, продовжити редагування" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" "Клацніть аби повернутися до редактора зв’язків та продовжити редагування" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8463,5 +8463,5 @@ "конфлікт та закрити редактор?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8472,50 +8472,50 @@ "розв’яжіть конфлікти, а потім спробуйте ще раз." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Застосувати поточні оновлення" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Застосувати оновлення і закрити діалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Скасувати оновлення та закрити діалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Додати порожній теґ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Завантажити усіх неповних членів" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Завантажити членів" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Редактор зв’язків: Завантажити членів" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Завантажити виділених неповних членів" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Встановити роль для виділених членів" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Застосувати роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8525,29 +8525,29 @@ msgstr[2] "Ви призначити пусту роль {0} елементам." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Це дорівнює вилученю ролі цих елементів." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "Ви дійсно бажаєте, застосувати нову роль?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Так, застосовувати" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Ні, не застосовувати" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Підтвердити порожню роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Виділений, при редагуванні зв’язку, член відноситься до" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8929,4 +8929,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12160,5 +12161,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56 msgid "Auto saved files per layer" -msgstr "Автоматично збережені файли для кожного шару" +msgstr "Кількість файлів автозбереження для кожного шару" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64 @@ -12925,9 +12926,9 @@ msgstr "Налаштування доступних втулків." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "Завантажити втулки" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "Потрібно перезапустити JOSM, щоб зміни набрали сили." @@ -13094,4 +13095,6 @@ msgid "Internal style to be used as base for runtime switchable overlay styles" msgstr "" +"Внутрішній візуальний стиль, на основі якого функціонуватимуть нові, які " +"можна перемикати в режимі реального часу" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:787 @@ -14248,11 +14251,11 @@ "ідентифікатором {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(Код={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -14768,10 +14771,10 @@ msgstr "З’єднання з сервером…" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "Не вдалося встановити підключення до API {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." @@ -14779,4 +14782,8 @@ "Не вдається підключитися до сервера OSM. Будь ласка, перевірте підключення " "до Інтернету." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "Не вдалося прочитати текст помилки." #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -15632,11 +15639,11 @@ "проблемою налаштувань. JOSM не буде працювати." -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "Попередження: не вдалося обробити zip-файл ''{0}''. Помилка: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -17297,5 +17304,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "Порожній шар" @@ -19390,10 +19397,10 @@ msgstr "Ряд будинків по вулиці" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "Правити OpenSeaMap" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "Редактор Seamark" @@ -21517,75 +21524,68 @@ msgstr "Виберіть послідовність ліній, що не розгалужується" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "Зберегти шар WMS" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "Безіменний шар WMS" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "Назва меню" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "Службовий проїзд" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "Посилання на сервіс" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "Шари" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "Отримати шари" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" "so you can not use it. This message will not show again." msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +"Цей шар не підтримує жодної із проекцій JOSM,тому ви не можете\n" +"використовувати його. Це повідомлення не буде відображатися знову." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "Помилка WMS" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "Показати границі" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "Помилка" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "Межі" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "Не креслити лінії між точками цього шару." - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "Для цього шару не знайдено габаритного прямокутника." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "Посилання на WMS" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "Невірний URL?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 -#, fuzzy +msgstr "Помилкове сервісне посилання." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." -msgstr "Виберіть перший шар WMS зі списку" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +msgstr "Неможливо отримати перелік шарів WMS." + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "Виберіть перший шар WMS зі списку" +msgstr "Неможливо здійснити розбір переліку шарів WMS." #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -21708,5 +21708,5 @@ "Це може призвести до помилкових координат." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" @@ -21715,19 +21715,19 @@ "спотворене" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(відключено)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Автоматичне завантаження шару WMS ({0}), в масштабі {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Завантаження шару WMS ({0}), в масштабі {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -21742,17 +21742,17 @@ "в будь-якому випадку?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "Так, отримати зображення" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "Невірний URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "Завантажити видимі квадрати мапи" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -21761,50 +21761,50 @@ "змініть розподільчу здатність" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "Змінити розподільчу здатність" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "Перезавантажити помилкові квадрати" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "Альфа-канал" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "Зберегти шар WMS у файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "Зберегти шар WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "Завантажити шар WMS з файлу" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "Завантажити шар WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Непідтримувана версія файлу WMS; знайдено {0}, очікувалось {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "Помилка формату файлу" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "Помилка завантаження файлу" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "Встановити закладку WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "Автоматичне завантаження" @@ -21822,26 +21822,32 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" +"{0} повинен працювати але дистанційне керування для цього втулку " +"відключене.\n" +"Вам треба оновити втулки." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" -"{0} повинен працювати але дистанційне керування відключене.\n" +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" "Поточна версія \"{1}\": {2}, внутрішня версія {3}. Потрібна версія {4}, " "внутрішня версія {5}.\n" -"Ван треба оновити втулок. Якщо це не допомагає — звітуйте про помилку у \"{0}" -"\"." - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"Якщо оновлення втулків не допомогло надішліть звіт про \"{0}\"." + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "{0}: Проблеми з дистанційним керуванням" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "Відкрити порожній шар WMS завантаження даних з файлу" @@ -21864,7 +21870,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "Посилання на WMS" +msgstr "Додати WMS-посилання" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -36109,7 +36114,4 @@ msgstr "PCN 2006 — Італія" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "Введіть назву пункту меню та посилання WMS" - #~ msgid "Error: {0}" #~ msgstr "Помилка: {0}" @@ -36417,4 +36419,7 @@ #~ msgid "Check for paint notes." #~ msgstr "Перевірити примітки до малюнка." + +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "Введіть назву пункту меню та посилання WMS" #~ msgid "Waterway Point" @@ -36473,2 +36478,15 @@ #~ msgid "8/d" #~ msgstr "8 годин на добу" + +#~ msgid "" +#~ "{0} will work but remote control is disabled.\n" +#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " +#~ "internal version {5}.\n" +#~ "You should update the plugins. If this does not help report a bug for " +#~ "\"{0}\"." +#~ msgstr "" +#~ "{0} повинен працювати але дистанційне керування відключене.\n" +#~ "Поточна версія \"{1}\": {2}, внутрішня версія {3}. Потрібна версія {4}, " +#~ "внутрішня версія {5}.\n" +#~ "Ван треба оновити втулок. Якщо це не допомагає — звітуйте про помилку у " +#~ "\"{0}\"." Index: /applications/editors/josm/i18n/po/zh_CN.po =================================================================== --- /applications/editors/josm/i18n/po/zh_CN.po (revision 23003) +++ /applications/editors/josm/i18n/po/zh_CN.po (revision 23004) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 22:40+0000\n" -"Last-Translator: bastik \n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-05 10:58+0000\n" +"Last-Translator: mmyfl \n" "Language-Team: Simplified Chinese \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-09-02 16:58+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -86,5 +86,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -254,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:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -422,5 +422,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -438,5 +438,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -610,10 +610,10 @@ msgstr "不能组合路径（它们无法合并为单一的节点串）" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "合并 {0} 条路径" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "请选择至少两个以上的路径来合并" @@ -662,5 +662,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -800,5 +800,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "制作副本" @@ -1463,5 +1463,5 @@ "The following dependent objects will be purged
      in addition to the " "selected objects:" -msgstr "" +msgstr "下面的依赖对象将被清除,
      除了选定的对象:" #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230 @@ -1507,8 +1507,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1567,6 +1567,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "错误" @@ -1574,5 +1574,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:54 msgid "Reverse way" -msgstr "" +msgstr "反转路径" #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:67 @@ -1727,5 +1727,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "否，中止" @@ -2981,5 +2981,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3104,5 +3104,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "双重冲突" @@ -3213,4 +3213,6 @@ "because you don''t see the real object.
      Do you really want to delete?" msgstr "" +"你将要删除不完整的对象。
      这会导致一些问题，因为你没有看到真正的对象。
      " +"你真的要删除吗？" #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42 @@ -3439,10 +3441,10 @@ msgstr "警告：将偏好设定固定为 \"{0}\" 失败" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "设定文件第 {0} 行格式不良" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3451,5 +3453,5 @@ msgstr "警告：初始化偏好设定失败。偏好设定目录 \"{0}\" 不是一个目录。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3459,5 +3461,5 @@ "初始化偏好设定失败。
      偏好设定目录 \"{0}\" 不是一个目录。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3466,5 +3468,5 @@ msgstr "警告：初始化偏好设定失败。无法建立缺少的偏好设定目录：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3473,5 +3475,5 @@ msgstr "初始化偏好设定失败。
      无法建立缺少的偏好设定目录：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3479,5 +3481,5 @@ msgstr "警告：缺少偏好设定文件 \"{0}\"。正在建立预设的偏好设定文件。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3486,5 +3488,5 @@ msgstr "警告：以预设的偏好设定文件取代现有的偏好设定文件 \"{0}\"。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3493,5 +3495,5 @@ msgstr "初始化偏好设定失败。
      无法将偏好设定重设为预设值：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3502,5 +3504,5 @@ "偏好设定文件。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3509,10 +3511,10 @@ msgstr "警告：初始化偏好设定失败。无法将偏好设定重设为预设值：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "错误：在书签文件 \"{1}\" 中有未预期的行 \"{0}\"" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -3918,5 +3920,5 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442 msgid "South" -msgstr "" +msgstr "南" #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446 @@ -4386,5 +4388,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257 msgid "Discard" -msgstr "" +msgstr "丢弃" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260 @@ -4392,10 +4394,9 @@ msgid "JOSM found {0} unsaved osm data layer. " msgid_plural "JOSM found {0} unsaved osm data layers. " -msgstr[0] "" -msgstr[1] "" +msgstr[0] "JOSM 发现 {0} 个未保存的 OSM 数据图层。 " #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 msgid "It looks like JOSM crashed last time. Do you like to restore the data?" -msgstr "" +msgstr "它看上去像是 JOSM 上一次崩溃时留下的。你想恢复数据吗?" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299 @@ -4753,5 +4754,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4769,5 +4770,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5271,5 +5272,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5951,5 +5952,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "建立这个关系的复本并且在另一个编辑器视窗开启它" @@ -6032,5 +6033,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7832,5 +7833,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7884,26 +7885,26 @@ msgstr "({0}/{1})：正在下载关系 \"{2}\" ..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "标签与成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "上层关系" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "子关系" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "应用角色：" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "输入一个角色并将它应用至选取的关系成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -7914,14 +7915,14 @@ "依关系，但是不建议这么做。
      您要如何处理循环相依关系?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "删除它们，清除关系" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "忽略它们，保持关系原貌" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7933,9 +7934,9 @@ "一个关系成员吗?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "多个成员参照到同一原型" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7947,15 +7948,15 @@ "做。
      正跳过关系 \"{0}\"。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "将目前数据组合中选取的所有原型加到第一个成员之前" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "将目前数据组合中选取的所有原型加到最后一个成员之后" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7963,5 +7964,5 @@ msgstr "将目前数据组合中选取的所有原型加到第一个选取的成员之前" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7969,20 +7970,20 @@ msgstr "将目前数据组合中选取的所有原型加到最后一个选取的成员之后" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "删除所有参照到选取原型其中之一的成员" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "关系编辑器：删除已选取的" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "选取参照到目前选取范围的关系成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7991,64 +7992,64 @@ msgstr "选取参照到目前选取范围{0} 原型的关系成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "选择已选取关系成员的原型" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "排序关系成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "排序" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "关系编辑器：排序" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "反转关系成员的顺序" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "反转" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "关系编辑器：反转" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "将目前选取的成员上移" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "关系编辑器：上移" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "将目前选取的成员下移" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "关系编辑器：下移" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "将目前选取的成员从这个关系中删除" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "关系编辑器：删除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "删除目前编辑的关系" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8059,23 +8060,23 @@ "它们已经从关系成员清单删除了。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "是，建立冲突并关闭" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "点击以建立冲突项目并关闭这个关系编辑器" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "否，继续编辑" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "点击以返回关系编辑器并继续关系的编辑" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8086,5 +8087,5 @@ "续编辑。

      是否要建立冲突并关闭编辑器? " -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8095,50 +8096,50 @@ "试一次。\"" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "应用目前的更新" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "应用更新并关闭此对话框" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "取消更新并关闭此对话框" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "加入空的标签" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "下载所有未完成的成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "下载成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "关系编辑器：下载成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "下载选取的未完成成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "为选取的成员设定角色" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "应用角色" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8146,29 +8147,29 @@ msgstr[0] "您正在设定{0} 个原型的空白角色。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "这样等同删除这些原型的角色。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "您确定要应用新的角色吗?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "是，应用它" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "否，不应用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "确认空白角色" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "编辑目前选取关系成员所参照的关系" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8340,5 +8341,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114 msgid "Clear textarea" -msgstr "" +msgstr "清除文本区" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123 @@ -8538,4 +8539,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -9881,5 +9883,5 @@ #, java-format msgid "Length: {0}" -msgstr "" +msgstr "长度: {0}" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203 @@ -9907,6 +9909,5 @@ msgid "{0} track, " msgid_plural "{0} tracks, " -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} 个轨迹, " #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630 @@ -11520,5 +11521,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49 msgid "Auto save interval (seconds)" -msgstr "" +msgstr "自动保存时间间隔 (秒)" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52 @@ -11526,9 +11527,9 @@ #, java-format msgid "Default value: {0}" -msgstr "" +msgstr "默认值: {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56 msgid "Auto saved files per layer" -msgstr "" +msgstr "为每个图层自动保存文件" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64 @@ -11541,5 +11542,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72 msgid "Keep backup files when saving data layers" -msgstr "" +msgstr "保存数据层时保留备份文件" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74 @@ -11552,4 +11553,6 @@ "the file name and saves it in the same folder.)      " msgstr "" +"(JOSM 可以在保存数据图层时保存备份文件。会在文件名上追加 \"~\" 并保存在同" +"一目录。)" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99 @@ -11765,5 +11768,5 @@ msgctxt "gpx_field" msgid "Name" -msgstr "" +msgstr "名称" #. gpx data field name @@ -12248,9 +12251,9 @@ msgstr "设定可用的插件。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "下载插件" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "您必须重新启动 JOSM 才能让某些设定值生效。" @@ -13499,11 +13502,11 @@ msgstr "需要开放的更改组合。却找到 id {0} 的关闭更改组合。" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(代码={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -13985,13 +13988,17 @@ msgstr "正在连接服务器..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "开启 API {0} 连接失败" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "无法连接到 osm 服务器。请检查您的互联网网络连接。" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14775,11 +14782,11 @@ "严重的错误：无法定位图片 \"{0}\"。这是严重的组态问题。JOSM 会停止运作。" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "警告：无法处理 zip 文件 \"{0}\"。例外为：{1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16357,5 +16364,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "空白图层" @@ -18411,10 +18418,10 @@ msgstr "连栋建筑" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20458,25 +20465,22 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "保存 WMS 图层" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "菜单名称" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "服务道路(Service)" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "图层" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20484,49 +20488,43 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "错误" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "边界" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "在这个图层的各点之间不要绘出线条。" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "无效的 URL?" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." -msgstr "先在清单中选取一个 WMS 图层。" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "先在清单中选取一个 WMS 图层。" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -20643,24 +20641,24 @@ "这可能会导致错误的坐标。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "警告：WMS 图层已停用，因为基础 URL \"{0}\" 出现异常" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(不使用)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS 图层 ({0})，于缩放 {1} 自动下载" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS 图层 ({0})，于缩放 {1} 下载" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20674,67 +20672,67 @@ "取回 WMS 拼贴?\"" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "是，抓取图片" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "无效的 URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "下载可见的拼贴" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "要求的区域太大。请拉近一点，或是改变解析度" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "改变解析度" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "重新载入错误的拼贴" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "透明色版" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "将 WMS 图层保存为文件" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "保存 WMS 图层" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "从文件载入 WMS 图层" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "载入 WMS 图层" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "不支持的 WMS 文件版本；发现 {0}，应为 {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "文件格式错误" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "载入文件有错误" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "设定 WMS 书签" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "自动下载" @@ -20752,21 +20750,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "开啓空白 WMS 图层以便自文件载入数据" @@ -20789,7 +20792,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMS URL" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -24266,5 +24268,5 @@ #: build/trans_presets.java:1106 msgid "Shipping" -msgstr "" +msgstr "船运" #. group "Shipping" @@ -24855,5 +24857,5 @@ #: build/trans_presets.java:1302 msgid "Buffer Stop" -msgstr "" +msgstr "止冲器" #. item "Transport/Railway/Buffer Stop" @@ -25497,14 +25499,14 @@ #: build/trans_presets.java:1422 msgid "Tyres" -msgstr "" +msgstr "补胎处" #. item "Car/Tyres" #: build/trans_presets.java:1423 msgid "Edit Tyres" -msgstr "" +msgstr "编辑补胎处" #: build/trans_presets.java:1429 build/trans_presets.java:1478 msgid "Contact:" -msgstr "" +msgstr "联系方式:" #. item "Car/Tyres" label "Contact:" @@ -25651,5 +25653,5 @@ #: build/trans_presets.java:1457 msgid "Edit Motorcycle Parking" -msgstr "" +msgstr "编辑摩托车停车场" #. item "Motorcycle/Parking" text "Name" @@ -25661,5 +25663,5 @@ #: build/trans_presets.java:1464 msgid "Motorcycle Dealer" -msgstr "" +msgstr "摩托车经销商" #. item "Motorcycle/Motorcycle Dealer" @@ -25667,22 +25669,22 @@ #: build/trans_presets.java:1466 msgid "Edit Shop Motorcycle" -msgstr "" +msgstr "编辑摩托车商店" #: build/trans_presets.java:1472 msgid "Services:" -msgstr "" +msgstr "服务:" #. item "Motorcycle/Motorcycle Dealer" label "Services:" #: build/trans_presets.java:1473 msgid "Sale" -msgstr "" +msgstr "减价" #: build/trans_presets.java:1475 build/trans_presets.java:1476 msgid "brand" -msgstr "" +msgstr "品牌" #: build/trans_presets.java:1476 msgid "Parts" -msgstr "" +msgstr "零件" #. item "Amenities/Recycling" check "Cans" @@ -26113,5 +26115,5 @@ #: build/trans_presets.java:1936 msgid "Internet access fee" -msgstr "免费网络接入" +msgstr "收费网络接入" #. @@ -26691,5 +26693,5 @@ #: build/trans_presets.java:2063 msgid "Flagpole" -msgstr "" +msgstr "旗杆" #. item "Tourism/Flagpole" @@ -26698,5 +26700,5 @@ #: build/trans_presets.java:2067 msgid "Information Terminal" -msgstr "" +msgstr "信息终端机" #. item "Tourism/Information Terminal" text "Name" @@ -26704,14 +26706,14 @@ #: build/trans_presets.java:2072 build/trans_presets.java:2082 msgid "Closer description" -msgstr "" +msgstr "贴切描述" #: build/trans_presets.java:2077 msgid "Audioguide" -msgstr "" +msgstr "语音导览" #. #: build/trans_presets.java:2087 msgid "Audioguide via mobile phone?" -msgstr "" +msgstr "在手机上的语音导览?" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" @@ -27733,5 +27735,5 @@ #: build/trans_presets.java:2483 build/trans_presets.java:2489 msgid "pitch" -msgstr "" +msgstr "场地" #: build/trans_presets.java:2234 build/trans_presets.java:2240 @@ -27779,5 +27781,5 @@ #: build/trans_presets.java:2458 msgid "stadium" -msgstr "竞技扬" +msgstr "体育场" #: build/trans_presets.java:2234 build/trans_presets.java:2240 @@ -28170,56 +28172,56 @@ #: build/trans_presets.java:2453 build/trans_presets.java:2454 msgid "Motorsport" -msgstr "" +msgstr "赛车" #. item "Motorsport/Motorsport" #: build/trans_presets.java:2455 msgid "Edit Motorsport" -msgstr "" +msgstr "编辑赛车" #: build/trans_presets.java:2460 msgid "Karting" -msgstr "" +msgstr "卡丁车" #. item "Motorsport/Karting" #: build/trans_presets.java:2461 msgid "Edit Karting" -msgstr "" +msgstr "编辑卡丁车" #: build/trans_presets.java:2466 msgid "Motocross" -msgstr "" +msgstr "摩托车越野赛" #. item "Motorsport/Motocross" #: build/trans_presets.java:2467 msgid "Edit Motocross" -msgstr "" +msgstr "编辑摩托车越野赛" #: build/trans_presets.java:2472 msgid "Safety Training" -msgstr "" +msgstr "安全培训" #. item "Motorsport/Safety Training" #: build/trans_presets.java:2473 msgid "Edit Safety Training" -msgstr "" +msgstr "编辑安全培训" #. #: build/trans_presets.java:2479 msgid "Model Aerodrome" -msgstr "" +msgstr "模型飞机机场" #. item "Motorsport/Model Aerodrome" #: build/trans_presets.java:2480 msgid "Edit Model Aerodrome" -msgstr "" +msgstr "编辑模型飞机机场" #: build/trans_presets.java:2485 msgid "RC Car" -msgstr "" +msgstr "遥控车" #. item "Motorsport/RC Car" #: build/trans_presets.java:2486 msgid "Edit RC Car" -msgstr "" +msgstr "编辑遥控车" #: build/trans_presets.java:2493 @@ -29258,5 +29260,5 @@ #: build/trans_presets.java:2829 msgid "Food" -msgstr "" +msgstr "食品" #. group "Food" @@ -30041,5 +30043,5 @@ #: build/trans_presets.java:3282 msgid "Nature" -msgstr "" +msgstr "自然" #. group "Nature" @@ -30366,10 +30368,10 @@ #: build/trans_presets.java:3471 msgid "Brownfield" -msgstr "棕色地带(待重新开发的城市用地)" +msgstr "棕色地带" #. item "Land use/Brownfield" #: build/trans_presets.java:3472 msgid "Edit Brownfield Landuse" -msgstr "编辑棕色地带" +msgstr "编辑棕色地带(待重新开发的城市用地)" #. item "Land use/Brownfield" text "Name" @@ -30406,5 +30408,5 @@ #: build/trans_presets.java:3497 msgid "Annotation" -msgstr "" +msgstr "注释" #. group "Annotation" @@ -30445,39 +30447,39 @@ #: build/trans_presets.java:3508 msgid "Post code" -msgstr "邮递区号" +msgstr "邮政编号" #. item "Annotation/Addresses" text "Post code" #: build/trans_presets.java:3509 msgid "Country code" -msgstr "国码" +msgstr "国家代码" #. item "Annotation/Addresses" combo "Country code" #: build/trans_presets.java:3509 msgid "AT" -msgstr "" +msgstr "奥地利(AT)" #: build/trans_presets.java:3509 msgid "CH" -msgstr "" +msgstr "瑞士(CH)" #: build/trans_presets.java:3509 msgid "DE" -msgstr "" +msgstr "德国(DE)" #: build/trans_presets.java:3509 msgid "FR" -msgstr "" +msgstr "法国(FR)" #: build/trans_presets.java:3509 msgid "GB" -msgstr "" +msgstr "英国(GB)" #: build/trans_presets.java:3509 msgid "IT" -msgstr "" +msgstr "意大利(IT)" #: build/trans_presets.java:3509 msgid "US" -msgstr "" +msgstr "美国(US)" #. item "Annotation/Address Interpolation" @@ -30509,10 +30511,10 @@ #: build/trans_presets.java:3519 msgid "Contact" -msgstr "" +msgstr "联系方式" #. item "Annotation/Contact" #: build/trans_presets.java:3520 msgid "Edit Contact information" -msgstr "" +msgstr "编辑联系方式信息" #. item "Annotation/Contact" text "Email Address" @@ -30520,10 +30522,10 @@ #: build/trans_presets.java:3528 msgid "Wikipedia" -msgstr "" +msgstr "维基百科" #. item "Annotation/Contact" text "Wikipedia" #: build/trans_presets.java:3529 msgid "Image" -msgstr "" +msgstr "图像" #. item "Relations/Multipolygon" @@ -30779,5 +30781,5 @@ #: build/trans_presets.java:3586 msgid "detour" -msgstr "" +msgstr "绕行" #. color otherrail @@ -30796,5 +30798,5 @@ #: build/trans_presets.java:3589 msgid "Symbol description" -msgstr "" +msgstr "符号说明" #. item "Relations/Route" text "Description" @@ -34778,5 +34780,5 @@ #: build/trans_validator.java:50 msgid "highway without a reference" -msgstr "没有编号参照的公路" +msgstr "没有编号的公路" #. way : I : highway == motorway && nat_ref != * @@ -34813,5 +34815,5 @@ #: build/trans_validator.java:63 msgid "barrier used on a way" -msgstr "" +msgstr "用于路径的障碍物" #. way : W : highway == * && barrier == * @@ -34820,5 +34822,5 @@ #: build/trans_validator.java:66 build/trans_validator.java:67 msgid "maxspeed used for footway" -msgstr "" +msgstr "用于步道的限速标签" #. way : I : highway == steps && maxspeed == * @@ -34835,10 +34837,10 @@ #: build/trans_validator.java:73 msgid "relation without type" -msgstr "" +msgstr "无类型的关系" #. relation : E : type != * #: build/trans_validator.java:75 msgid "restaurant without name" -msgstr "" +msgstr "无名字的餐馆" #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * @@ -34848,5 +34850,5 @@ #: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" -msgstr "" +msgstr "不寻常的标签组合" #. FORMAT @@ -34861,5 +34863,5 @@ #: build/trans_wms.java:6 msgid "Landsat (mirror)" -msgstr "" +msgstr "Landsat (镜像)" #. http://irs.gis-lab.info/?layers=landsat& @@ -34985,7 +34987,4 @@ msgid "PCN 2006 - Italy" msgstr "" - -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "输入菜单名称和 WMS URL" #~ msgid "The selected way does not contain the selected node." @@ -35053,4 +35052,7 @@ #~ "\n" +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "输入菜单名称和 WMS URL" + #~ msgid "Waterway Point" #~ msgstr "水路点" Index: /applications/editors/josm/i18n/po/zh_TW.po =================================================================== --- /applications/editors/josm/i18n/po/zh_TW.po (revision 23003) +++ /applications/editors/josm/i18n/po/zh_TW.po (revision 23004) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-02 19:08+0200\n" -"PO-Revision-Date: 2010-08-29 22:57+0000\n" +"POT-Creation-Date: 2010-09-05 22:59+0200\n" +"PO-Revision-Date: 2010-09-02 21:56+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-09-02 16:58+0000\n" +"X-Launchpad-Export-Date: 2010-09-05 20:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: zh_TW\n" @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -87,5 +87,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 @@ -255,5 +255,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -423,5 +423,5 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42 #: ../plugins/terracer/src/terracer/TerracerAction.java:66 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46 @@ -439,5 +439,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 @@ -611,10 +611,10 @@ msgstr "不能組合路徑（它們無法合併為節點的單一字串）" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 #, java-format msgid "Combine {0} ways" msgstr "組合 {0} 條路徑" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252 msgid "Please select at least two ways to combine." msgstr "請選擇至少兩個以上的路徑來合併" @@ -663,5 +663,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -801,5 +801,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "重製" @@ -1506,8 +1506,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:473 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119 @@ -1566,6 +1566,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684 msgid "Error" msgstr "錯誤" @@ -1726,5 +1726,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 msgid "No, abort" msgstr "否，中止" @@ -2982,5 +2982,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 @@ -3105,5 +3105,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "雙重衝突" @@ -3440,10 +3440,10 @@ msgstr "警告：將偏好設定固定為「{0}」失敗" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "Malformed config file at lines {0}" msgstr "設定檔案第 {0} 行格式不良" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:458 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 #, java-format msgid "" @@ -3452,5 +3452,5 @@ msgstr "警告：初始化偏好設定失敗。偏好設定目錄「{0}」不是一個目錄。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:461 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467 #, java-format msgid "" @@ -3459,5 +3459,5 @@ msgstr "初始化偏好設定失敗。
      偏好設定目錄「{0}」不是一個目錄。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:469 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -3466,5 +3466,5 @@ msgstr "警告：初始化偏好設定失敗。無法建立缺少的偏好設定目錄：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 #, java-format msgid "" @@ -3473,5 +3473,5 @@ msgstr "初始化偏好設定失敗。
      無法建立缺少的偏好設定目錄：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 #, java-format msgid "" @@ -3479,5 +3479,5 @@ msgstr "警告：缺少偏好設定檔案「{0}」。正在建立預設的偏好設定檔案。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493 #, java-format msgid "" @@ -3486,5 +3486,5 @@ msgstr "警告：以預設的偏好設定檔案取代現有的偏好設定檔案「{0}」。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:495 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -3493,5 +3493,5 @@ msgstr "初始化偏好設定失敗。
      無法將偏好設定重設為預設值：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514 #, java-format msgid "" @@ -3502,5 +3502,5 @@ "偏好設定檔案。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:518 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524 #, java-format msgid "" @@ -3509,10 +3509,10 @@ msgstr "警告：初始化偏好設定失敗。無法將偏好設定重設為預設值：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:544 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "錯誤：在書籤檔案「{1}」中有未預期的行「{0}」" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:554 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561 #, java-format msgid "" @@ -4755,5 +4755,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4771,5 +4771,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5273,5 +5273,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5954,5 +5954,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "建立這個關係的複本並且在另一個編輯器視窗開啟它" @@ -6035,5 +6035,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -7835,5 +7835,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7887,26 +7887,26 @@ msgstr "({0}/{1})：正在下載關係「{2}」..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "標籤與成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "上層關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "子關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "套用角色：" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "輸入一個角色並將它套用至選取的關係成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
      to the " @@ -7917,14 +7917,14 @@ "依關係，但是不建議這麼做。
      您要如何處理循環相依關係？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "移除它們，清除關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "忽略它們，保持關係原貌" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7936,9 +7936,9 @@ "個關係成員嗎？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "多個成員參照到同一原型" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7950,15 +7950,15 @@ "做。
      正略過關係「{0}」。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "將目前資料組合中選取的所有原型加到第一個成員之前" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "將目前資料組合中選取的所有原型加到最後一個成員之後" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7966,5 +7966,5 @@ msgstr "將目前資料組合中選取的所有原型加到第一個選取的成員之前" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7972,20 +7972,20 @@ msgstr "將目前資料組合中選取的所有原型加到最後一個選取的成員之後" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "移除所有參照到選取原型其中之一的成員" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "關係編輯器：移除已選取的" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "選取參照到目前選取範圍的關係成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7994,64 +7994,64 @@ msgstr "選取參照到目前選取範圍 {0} 原型的關係成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "選擇已選取關係成員的原型" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "排序關係成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "排序" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "關係編輯器：排序" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "反轉關係成員的順序" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "反轉" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "關係編輯器：反轉" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "將目前選取的成員上移" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "關係編輯器：上移" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "將目前選取的成員下移" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "關係編輯器：下移" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "將目前選取的成員從這個關係中移除" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "關係編輯器：移除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "刪除目前編輯的關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8062,23 +8062,23 @@ "它們已經從關係成員清單移除了。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "是，建立衝突並關閉" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "點選以建立衝突項目並關閉這個關係編輯器" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "否，繼續編輯" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "點選以返回關係編輯器並繼續關係的編輯" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
      You cannot " @@ -8089,5 +8089,5 @@ "續編輯。

      是否要建立衝突並關閉編輯器？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8098,50 +8098,50 @@ "一次。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "套用目前的更新" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "套用更新並關閉此對話盒" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "取消更新並關閉此對話盒" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "加入空的標籤" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "下載所有未完成的成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "下載成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "關係編輯器：下載成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "下載選取的未完成成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "為選取的成員設定角色" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "套用角色" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8149,29 +8149,29 @@ msgstr[0] "您正在設定 {0} 個原型的空白角色。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "這樣等同刪除這些原型的角色。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "您確定要套用新的角色嗎？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "是，套用它" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "否，不套用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "確認空白角色" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "編輯目前選取關係成員所參照的關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493 msgid "" "Members from paste buffer cannot be added because they are not included in " @@ -8541,4 +8541,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190 #: build/trans_presets.java:386 build/trans_presets.java:387 #: build/trans_presets.java:388 build/trans_presets.java:389 @@ -12241,9 +12242,9 @@ msgstr "設定可用的外掛程式。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:144 msgid "Download plugins" msgstr "下載外掛程式" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:176 msgid "You have to restart JOSM for some settings to take effect." msgstr "您必須重新啟動 JOSM 才能讓某些設定值生效。" @@ -13492,11 +13493,11 @@ msgstr "需要開放的變更組合。卻找到 id {0} 的關閉變更組合。" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88 -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:103 #, java-format msgid "(Code={0})" msgstr "(代碼={0})" -#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94 +#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105 #, java-format msgid "The server replied an error with code {0}." @@ -13977,13 +13978,17 @@ msgstr "正在連接伺服器..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:65 #, java-format msgid "Failed to open connection to API {0}." msgstr "開啟 API {0} 連線失敗" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88 msgid "" "Could not connect to the OSM server. Please check your internet connection." msgstr "無法連線到 osm 伺服器。請檢查您的網際網路連線。" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114 +msgid "Reading error text failed." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38 @@ -14770,11 +14775,11 @@ msgstr "嚴重的錯誤：無法定位圖片「{0}」。這是嚴重的組態問題。JOSM 會停止運作。" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:164 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:172 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "警告：無法處理 zip 檔案「{0}」。例外為：{1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:216 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:230 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:231 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:245 #, java-format msgid "" @@ -16352,5 +16357,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Blank Layer" msgstr "空白圖層" @@ -18406,10 +18411,10 @@ msgstr "連棟建築" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 msgid "Edit OpenSeaMap" msgstr "" -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:202 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:204 msgid "Seamark Editor" msgstr "" @@ -20454,25 +20459,22 @@ msgstr "選擇路徑的非分支次序" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77 msgid "Unnamed WMS Layer" -msgstr "儲存 WMS 圖層" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "Menu Name" msgstr "選單名稱" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83 msgid "Service URL" -msgstr "服務型(Service)" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88 msgid "Get Layers" -msgstr "圖層" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124 msgid "" "That layer does not support any of JOSM's projections,\n" @@ -20480,49 +20482,43 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:256 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:285 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:297 +msgid "WMS Error" +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:151 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158 +msgid "Show Bounds" +msgstr "" + #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282 -#, fuzzy -msgid "WMS Error" -msgstr "錯誤" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157 -#, fuzzy -msgid "Show Bounds" -msgstr "邊界" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159 -#, fuzzy msgid "No bounding box was found for this layer." -msgstr "在這個圖層的各點之間不要繪出線條。" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167 +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227 -#, fuzzy +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235 msgid "Invalid service URL." -msgstr "無效的 URL？" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255 msgid "Could not retrieve WMS layer list." -msgstr "先在清單中選取一個 WMS 圖層。" - -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269 -#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281 -#, fuzzy +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:284 +#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296 msgid "Could not parse WMS layer list." -msgstr "先在清單中選取一個 WMS 圖層。" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76 @@ -20639,24 +20635,24 @@ "這可能會導致錯誤的坐標。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "警告：不使用 WMS 圖層，因為基礎 url「{0}」格式錯誤" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:136 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139 msgid "(deactivated)" msgstr "(不使用)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS 圖層 ({0})，於縮放 {1} 自動下載" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS 圖層 ({0})，於縮放 {1} 下載" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237 #, java-format msgid "" @@ -20670,67 +20666,67 @@ "WMS 拼貼？" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245 msgid "Yes, fetch images" msgstr "是，抓取圖片" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251 msgid "Invalid URL?" msgstr "無效的 URL？" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527 msgid "Download visible tiles" msgstr "下載可見的拼貼" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "要求的區域太大。請拉近一點，或是改變解析度" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545 msgid "Change resolution" msgstr "改變解析度" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558 msgid "Reload erroneous tiles" msgstr "重新載入錯誤的拼貼" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579 msgid "Alpha channel" msgstr "透明色版" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607 msgid "Save WMS layer to file" msgstr "將 WMS 圖層儲存為檔案" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611 msgid "Save WMS layer" msgstr "儲存 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635 msgid "Load WMS layer from file" msgstr "從檔案載入 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639 msgid "Load WMS layer" msgstr "載入 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "不支援的 WMS 檔案版本；發現 {0}，應為 {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651 msgid "File Format Error" msgstr "檔案格式錯誤" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683 msgid "Error loading file" msgstr "載入檔案有錯誤" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697 msgid "Set WMS Bookmark" msgstr "設定 WMS 書籤" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723 msgid "Automatic downloading" msgstr "自動下載" @@ -20748,21 +20744,26 @@ #, java-format msgid "" -"{0} will work but remote control is disabled.\n" +"{0} will work but remote control for this plugin is disabled.\n" +"You should update the plugins." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182 +#, java-format +msgid "" "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, " "internal version {5}.\n" -"You should update the plugins. If this does not help report a bug for \"{0}" -"\"." -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:192 +"If updating the plugins does not help report a bug for \"{0}\"." +msgstr "" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194 #, java-format msgid "{0}: Problem with remote control" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:332 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337 msgid "Open a blank WMS layer to load data from a file" msgstr "開啓空白 WMS 圖層以便自檔案載入資料" @@ -20785,7 +20786,6 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81 -#, fuzzy msgid "Add WMS URL" -msgstr "WMS URL" +msgstr "" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104 @@ -34990,7 +34990,4 @@ msgstr "" -#~ msgid "Enter a menu name and WMS URL" -#~ msgstr "輸入選單名稱和 WMS URL" - #~ msgid "Open in Browser" #~ msgstr "在瀏覽器中打開" @@ -35803,4 +35800,7 @@ #~ "注意：請確定圖片是合適的，沒有版權問題，如果有疑慮，請不要使用。" +#~ msgid "Enter a menu name and WMS URL" +#~ msgstr "輸入選單名稱和 WMS URL" + #~ msgid "Please select the row to copy." #~ msgstr "請選擇要複製的列。"